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, 11 Jun 2018 20:48:32 -0400 Message-ID: References: <87h8mayz71.fsf@gmail.com> <87efhd6rxd.fsf@randomsample> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000c66e9f056e673976" X-Trace: blaine.gmane.org 1528764406 21952 195.159.176.226 (12 Jun 2018 00:46:46 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 12 Jun 2018 00:46:46 +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 12 02:46:42 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 1fSXSJ-0005bB-Io for ged-emacs-devel@m.gmane.org; Tue, 12 Jun 2018 02:46:39 +0200 Original-Received: from localhost ([::1]:51990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSXUQ-0003NN-42 for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 20:48:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSXUC-0003MV-RC for emacs-devel@gnu.org; Mon, 11 Jun 2018 20:48:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSXUB-000474-V2 for emacs-devel@gnu.org; Mon, 11 Jun 2018 20:48:36 -0400 Original-Received: from mail-oi0-x230.google.com ([2607:f8b0:4003:c06::230]:36688) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSXUA-00044P-Az; Mon, 11 Jun 2018 20:48:34 -0400 Original-Received: by mail-oi0-x230.google.com with SMTP id 14-v6so19592224oie.3; Mon, 11 Jun 2018 17:48:34 -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=xVrKvh/2cl8d7Vntwzbrow12QTK2m/oXZ114Uo48Q9Q=; b=DsRQrd2wgu5wJiuxlZn8YxguQz2gtoleVmxG9azi5rN9zHS7g+VuVsnYD/NwpaZNrS 8iZdJScrqHYn96YGzp4YjFKmHL7uRgBdWSh4tbpjiHrYwJ5eZbEJsR/pD+fjgzto0XVj NSIoG0kuNTlvJ7XCAk8+XYj/mgtrTb98P3P4sgv3ivgdIt13aOCVItOF+Om5zw4Zsh6E LEu/5X+sL7hfG2qAMlNmSzIUT7AovHJEyw3Aauw3D+KXVrP9/JKxrgoFl5Vr6lbeL++7 Ka8B60IYyjp6evLLR4H9W/B+umvlUNEaVIFV7CP/46ok1r8gyVKJvsYP4VDj3WghUOWp M+jw== 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=xVrKvh/2cl8d7Vntwzbrow12QTK2m/oXZ114Uo48Q9Q=; b=dv0fSYK5GPJC0ppBnUw00pJKCGE3GVv6MQykLS2GG0lJcH6Tp11AfOS278L2vaggHE 1U9Tg4OJP2NeqdZadkEQml7fk+Bmw3aJWbXOSz/IPQqoV+leozPPCCa05p2rSEEyf8a9 JabSduDMIbFATemEyINeq2nJg8EkW+c6kvdMEXt3wb/2lVaRUoHYZE2Q0yEeTsNE0glz q7n+1gc/R/No04LzUo7XOTu4QvhJiOOdqFv7t0ZEFqKL87Wt4gNS4nghMta0O2WIHn2r hz/2ahJcgwXWXH2zvhUVOtxp06uByQ9j1PrG5qMi6X1qG9uxLLRVYCNgX2uKbSEMdhcD eeig== X-Gm-Message-State: APt69E1iN3IZt0QECn5zE+fLneOx/DbsN+Lwam5/Rm6Jhlwtlxv/offW ux+847eyx8GhVzFeOjC/OE7cpoWcX1NXjV7jMdAu7Q== X-Google-Smtp-Source: ADUXVKLluXdKYliUqNlxEUQ/zTVoqNI8k9XlrpFb+YaScFDQQHI7wdH4o3gN8Ol65kc9JBT5oualCO/kmXftElkXNu8= X-Received: by 2002:aca:504d:: with SMTP id e74-v6mr817508oib.304.1528764513525; Mon, 11 Jun 2018 17:48:33 -0700 (PDT) Original-Received: by 2002:a4a:3b84:0:0:0:0:0 with HTTP; Mon, 11 Jun 2018 17:48:32 -0700 (PDT) In-Reply-To: <87efhd6rxd.fsf@randomsample> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::230 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:226245 Archived-At: --000000000000c66e9f056e673976 Content-Type: text/plain; charset="UTF-8" >> And given the current implementation of gitmerge-repo-clean I can't >> see how it could work any other way. Turns out I got a bit confused reading the boolean expression in gitmerge-repo-clean. On 11 June 2018 at 15:31, David Engster wrote: > Look in `gitmerge-maybe-resume': It checks if there's an ongoing merge > (by checking for .git/MERGE_HEAD) and also a status file from a previous > gitmerge run. If that is both the case and the user accepts the resume, > it will jump to `gitmerge-resolve-unmerged', which should add all > non-conflicted files and commit the merge. 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. --000000000000c66e9f056e673976 Content-Type: text/x-diff; charset="US-ASCII"; name="0001-Don-t-assume-.git-is-a-directory-in-gitmerge.el.patch" Content-Disposition: attachment; filename="0001-Don-t-assume-.git-is-a-directory-in-gitmerge.el.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jiayq4dw0 RnJvbSBhM2QyYTY2ZDk3YTY0ODhmOTkyMzNlYWQzNTdlYWIwZDcwNTVjM2M4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb2FtIFBvc3RhdnNreSA8bnBvc3RhdnNAZ21haWwuY29tPgpE YXRlOiBNb24sIDExIEp1biAyMDE4IDIwOjQxOjA3IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gRG9u J3QgYXNzdW1lIC5naXQgaXMgYSBkaXJlY3RvcnkgaW4gZ2l0bWVyZ2UuZWwKCiogYWRtaW4vZ2l0 bWVyZ2UuZWwgKGdpdG1lcmdlLW1heWJlLXJlc3VtZSk6IFVzZSAnZ2l0IHJldi1wYXJzZQotLWdp dC1kaXInIHRvIGZpbmQgdGhlIGdpdCBkaXJlY3RvcnkgcmF0aGVyIHRoYW4gYXNzdW1pbmcgaXQg aXMKLmdpdC8gKHRoYXQgYXNzdW1wdGlvbiBmYWlscyBmb3Igc2VwYXJhdGVkIHdvcmt0cmVlcyku Ci0tLQogYWRtaW4vZ2l0bWVyZ2UuZWwgfCA4ICsrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgNiBp bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FkbWluL2dpdG1lcmdl LmVsIGIvYWRtaW4vZ2l0bWVyZ2UuZWwKaW5kZXggZTY3NmU4ZmEwMi4uOGE4NDQ0YWE0MCAxMDA2 NDQKLS0tIGEvYWRtaW4vZ2l0bWVyZ2UuZWwKKysrIGIvYWRtaW4vZ2l0bWVyZ2UuZWwKQEAgLTQ4 Myw4ICs0ODMsMTIgQEAgZ2l0bWVyZ2UtY29tbWl0CiAoZGVmdW4gZ2l0bWVyZ2UtbWF5YmUtcmVz dW1lICgpCiAgICJDaGVjayBpZiB3ZSBoYXZlIHRvIHJlc3VtZSBhIG1lcmdlLgogSWYgc28sIGFk ZCBubyBsb25nZXIgY29uZmxpY3RlZCBmaWxlcyBhbmQgY29tbWl0LiIKLSAgKGxldCAoKG1lcmdl aGVhZCAoZmlsZS1leGlzdHMtcAotCQkgICAgKGV4cGFuZC1maWxlLW5hbWUgIi5naXQvTUVSR0Vf SEVBRCIgZGVmYXVsdC1kaXJlY3RvcnkpKSkKKyAgKGxldCAoKG1lcmdlaGVhZCA7Z2l0X2NvbW1v bl9kaXI9CisgICAgICAgICAoZmlsZS1leGlzdHMtcAorCSAgKGV4cGFuZC1maWxlLW5hbWUKKyAg ICAgICAgICAgIk1FUkdFX0hFQUQiCisgICAgICAgICAgIChjYXIgKHByb2Nlc3MtbGluZXMKKyAg ICAgICAgICAgICAgICAgImdpdCIgInJldi1wYXJzZSIgIi0tbm8tZmxhZ3MiICItLWdpdC1kaXIi KSkpKSkKIAkoc3RhdHVzZXhpc3QgKGZpbGUtZXhpc3RzLXAgZ2l0bWVyZ2Utc3RhdHVzLWZpbGUp KSkKICAgICAod2hlbiAoYW5kIG1lcmdlaGVhZCAobm90IHN0YXR1c2V4aXN0KSkKICAgICAgICh1 c2VyLWVycm9yICJVbmZpbmlzaGVkIG1lcmdlLCBidXQgbm8gcmVjb3JkIG9mIGEgcHJldmlvdXMg Z2l0bWVyZ2UgcnVuIikpCi0tIAoyLjExLjAKCg== --000000000000c66e9f056e673976--