From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Resuming M-x gitmerge Date: Mon, 18 Jun 2018 20:27:57 -0400 Message-ID: References: <87h8mayz71.fsf@gmail.com> <87efhd6rxd.fsf@randomsample> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1529367963 24642 195.159.176.226 (19 Jun 2018 00:26:03 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 19 Jun 2018 00:26:03 +0000 (UTC) Cc: Glenn Morris , Emacs developers To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jun 19 02:25:59 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fV4T8-0006Hn-UU for ged-emacs-devel@m.gmane.org; Tue, 19 Jun 2018 02:25:59 +0200 Original-Received: from localhost ([::1]:38170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV4VD-0008RQ-N1 for ged-emacs-devel@m.gmane.org; Mon, 18 Jun 2018 20:28:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV4V7-0008RJ-5q for emacs-devel@gnu.org; Mon, 18 Jun 2018 20:28:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fV4V6-0007Cv-9S for emacs-devel@gnu.org; Mon, 18 Jun 2018 20:28:01 -0400 Original-Received: from mail-ot0-x236.google.com ([2607:f8b0:4003:c0f::236]:39106) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fV4V4-0007C0-Jt; Mon, 18 Jun 2018 20:27:58 -0400 Original-Received: by mail-ot0-x236.google.com with SMTP id l15-v6so20620804oth.6; Mon, 18 Jun 2018 17:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=NES12oIGhE6FEaZTATdPqf1SlCBAaMvsZWZXCU2U5QY=; b=h0k3En3Dj/xuSUrBzKY0THVVn9d2KiM0Y2dxPPblOcxjeePKCTTR59y4VD5W3UQUXf AMg+D8rXuQd2Bhf/Tto6PFbd2T2snqqf96FfCXUHipIPjrPoNABRkgvC8E+uMCB5RHKW 0JpJfmFfybQizW21G1CMxatfja5RbdezzAPF9Hce1puIF8Ina2oeFyjs4Cgt3OQr14IP WSp4YZFSZMsBiZSbqugk6Mt//HIazo3z5BeZ/EiMpjNLgOOnEPocxCXboRZqpzNhs9U3 fIbIVDLleXvdksCBdEiHYPA5Ntb9G74PWdk2zTlY9ncdbtBnBYISfOMmxxzrW7q/zIiJ GvLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=NES12oIGhE6FEaZTATdPqf1SlCBAaMvsZWZXCU2U5QY=; b=ha3T69un3L4AQxVOBFiCo8nVAXT7tF6uvwtmHs/YtC0Kiy93qGsVYlCQRn1ckOHSl8 1MEMpPv50UM7kf/M1ztsTEh4wr7+Lv7FkvAme42LqxQgjtZke1TDfz+YMakb71btBEi5 ZMk+gFBe1e4qoyYLvgJ/wlKUZolcYTUY92L7SihTzHpFSSM8Y50nCvGKhJd18wOzJFsT 9hFXlt47+DqY7mgChGOau8BxwgfM1ldAS+D1hSu/KakU3ft3cBZCQQ4tItFy6fpNhghz 0ah6DhdJZZY4cQU4QqCBaw5mfzcNZqwntw5qcpSFdTJJ+gdOBsLahcuLPgEukf22GG6P jM1w== X-Gm-Message-State: APt69E2OwmNFvNYRxR0ellKXDNh+G87DnzbQzUOfBskT4aXOSJ63pugz CAW5eY8lanb7Fem7Hzj9z0qydIb2S2ShB1ieWb5WfA== X-Google-Smtp-Source: ADUXVKJBDoz75kN6G/bj30tsx6n4qlnuiuyazLVJwXoNsRhrSNDwoRYSwfXGbUgSeDGjxSw2X0PU2xOqX3HJRZbzCXM= X-Received: by 2002:a9d:3851:: with SMTP id r17-v6mr8531674otd.335.1529368077921; Mon, 18 Jun 2018 17:27:57 -0700 (PDT) Original-Received: by 2002:a4a:3b84:0:0:0:0:0 with HTTP; Mon, 18 Jun 2018 17:27:57 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c0f::236 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:226481 Archived-At: On 11 June 2018 at 20:48, Noam Postavsky wrote: > Oh, I see what it is. The reason it doesn't work for me is that I use > git-worktree, so the .git/MERGE_HEAD test gives the wrong answer. And > now I see that gitmerge-resolve does actually do 'git add' if needed, > so the current message is actually perfectly fine. The attached lets > it work for me, I think that should cover everything. Pushed to master. [1: 5498acb5a2]: 2018-06-18 20:02:04 -0400 Stop assuming .git is a directory in gitmerge.el https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=5498acb5a2b4a19060d17c0e2ce0aec36ee684f9