From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) Date: Wed, 12 Apr 2017 11:26:22 -0700 Organization: UCLA Computer Science Department Message-ID: <955c464e-5833-10fd-9c02-d7edda70e488@cs.ucla.edu> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------F7D82DC37EC7F63BDBEE70C8" X-Trace: blaine.gmane.org 1492021598 10278 195.159.176.226 (12 Apr 2017 18:26:38 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 12 Apr 2017 18:26:38 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 Cc: martin rudalics , emacs-devel , Andreas Schwab To: Noam Postavsky , Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 12 20:26:33 2017 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 1cyMyP-0002Xd-3U for ged-emacs-devel@m.gmane.org; Wed, 12 Apr 2017 20:26:33 +0200 Original-Received: from localhost ([::1]:45773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyMyU-0000IL-HF for ged-emacs-devel@m.gmane.org; Wed, 12 Apr 2017 14:26:38 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyMyO-0000IE-Pf for emacs-devel@gnu.org; Wed, 12 Apr 2017 14:26:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cyMyK-00029l-QT for emacs-devel@gnu.org; Wed, 12 Apr 2017 14:26:32 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:46678) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cyMyK-000295-HK for emacs-devel@gnu.org; Wed, 12 Apr 2017 14:26:28 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id A21D7160208; Wed, 12 Apr 2017 11:26:26 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id G3EdBbYJZRKF; Wed, 12 Apr 2017 11:26:25 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id DEB7B16020D; Wed, 12 Apr 2017 11:26:25 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id CQRCiPosku92; Wed, 12 Apr 2017 11:26:25 -0700 (PDT) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id AA0C7160208; Wed, 12 Apr 2017 11:26:25 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 131.179.128.68 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:213918 Archived-At: This is a multi-part message in MIME format. --------------F7D82DC37EC7F63BDBEE70C8 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 04/11/2017 09:25 AM, Noam Postavsky wrote: > Perhaps we should change the hook so that it doesn't complain about > problems from merges? Something like that might make sense, yes, for people in Alan's situation. When I do a merge, though, I'd rather see problems from the other side (so that I can fix them). How about an environment variable that captures the user's preference? > +# If we're merging, don't flag problems that came from the other side > +# of the merge. > +head=HEAD > +if [ -f "$GIT_DIR"/MERGE_HEAD ] ; then > + head=$(cat "$GIT_DIR"/MERGE_HEAD) > +fi This won't work if MERGE_HEAD file contains more than one entry, which can happen when doing a 3- or more-way merge. How about the attached (untested) patch instead? It behaves the way that you suggested, when doing a 2-way merge and when the GIT_MERGE_BLINDLY environment variable is set to 'true'. Offhand I don't see a way of supporting 3- or more-way merges easily, so this patch punts and ignores GIT_MERGE_BLINDLY when doing fancier merges. --------------F7D82DC37EC7F63BDBEE70C8 Content-Type: application/x-patch; name="0001-Allow-bypassing-of-some-checks-when-merging.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Allow-bypassing-of-some-checks-when-merging.patch" RnJvbSAxYzIwN2E3NzU2YWMzNzkwNmZiNDcxNjFmM2M3MjI3M2VjYWU2ZTZmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QFBlbmd1aW4uQ1Mu VUNMQS5FRFU+CkRhdGU6IFdlZCwgMTIgQXByIDIwMTcgMTE6MjQ6NDEgLTA3MDAKU3ViamVj dDogW1BBVENIXSBBbGxvdyBieXBhc3Npbmcgb2Ygc29tZSBjaGVja3Mgd2hlbiBtZXJnaW5n CgoqIGJ1aWxkLWF1eC9naXQtaG9va3MvcHJlLWNvbW1pdDoKTWVyZ2UgYmxpbmRseSBpZiBH SVRfTUVSR0VfQkxJTkRMWSBpcyB0cnVlLgotLS0KIGJ1aWxkLWF1eC9naXQtaG9va3MvcHJl LWNvbW1pdCB8IDE5ICsrKysrKysrKysrKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBp bnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2J1aWxkLWF1eC9n aXQtaG9va3MvcHJlLWNvbW1pdCBiL2J1aWxkLWF1eC9naXQtaG9va3MvcHJlLWNvbW1pdApp bmRleCA2NDgzYmZjLi5hZTQxZjkwIDEwMDc1NQotLS0gYS9idWlsZC1hdXgvZ2l0LWhvb2tz L3ByZS1jb21taXQKKysrIGIvYnVpbGQtYXV4L2dpdC1ob29rcy9wcmUtY29tbWl0CkBAIC0y NSwxNiArMjUsMjkgQEAgTENfQUxMPQogCiAuIGdpdC1zaC1zZXR1cAogCisjIFdoZW4gR0lU X01FUkdFX0JMSU5ETFkgaXMgJ3RydWUnLCB0aGVuIHdoZW4gZG9pbmcgYSB0d28td2F5IG1l cmdlLAorIyBpZ25vcmUgcHJvYmxlbXMgdGhhdCBjYW1lIGZyb20gdGhlIG90aGVyIHNpZGUg b2YgdGhlIG1lcmdlLgoraGVhZD1IRUFECitpZiB0ZXN0ICIkR0lUX01FUkdFX0JMSU5ETFki ID0gdHJ1ZSAmJiB0ZXN0IC1lICIkR0lUX0RJUiIvTUVSR0VfSEVBRDsgdGhlbgorICBtZXJn ZV9oZWFkcz1gY2F0ICIkR0lUX0RJUiIvTUVSR0VfSEVBRGAgfHwgZXhpdAorICBmb3IgbWVy Z2VfaGVhZCBpbiAkbWVyZ2VfaGVhZHM7IGRvCisgICAgY2FzZSAkaGVhZCBpbgorICAgICAg SEVBRCkgaGVhZD0kbWVyZ2VfaGVhZDs7CisgICAgICAqKSBoZWFkPUhFQUQ7IGJyZWFrOzsK KyAgICBlc2FjCisgIGRvbmUKK2ZpCisKIGdpdF9kaWZmPSdnaXQgZGlmZiAtLWNhY2hlZCAt LW5hbWUtb25seSAtLWRpZmYtZmlsdGVyPUEnCiBva19jaGFycz0nXDArWz0tPV0uLzAtOUEt Wl9hLXonCi1uYmFkY2hhcnM9YCRnaXRfZGlmZiAteiBIRUFEIHwgdHIgLWQgIiRva19jaGFy cyIgfCB3YyAtY2AKK25iYWRjaGFycz1gJGdpdF9kaWZmIC16ICRoZWFkOyBkb25lIHwgdHIg LWQgIiRva19jaGFycyIgfCB3YyAtY2AKIAogaWYgdGVzdCAiJG5iYWRjaGFycyIgLW5lIDA7 IHRoZW4KICAgZWNobyAiRmlsZSBuYW1lIGRvZXMgbm90IGNvbnNpc3Qgb2YgLSsuL18gb3Ig QVNDSUkgbGV0dGVycyBvciBkaWdpdHMuIgogICBleGl0IDEKIGZpCiAKLWZvciBuZXdfbmFt ZSBpbiBgJGdpdF9kaWZmIEhFQURgOyBkbworZm9yIG5ld19uYW1lIGluIGAkZ2l0X2RpZmYg JGhlYWRgOyBkbwogICBjYXNlICRuZXdfbmFtZSBpbgogICAgIC0qIHwgKi8tKikKICAgICAg IGVjaG8gIiRuZXdfbmFtZTogRmlsZSBuYW1lIGNvbXBvbmVudCBiZWdpbnMgd2l0aCAnLScu IgpAQCAtNTMsNCArNjYsNCBAQCBuYmFkY2hhcnM9CiAjIHRlc3RzIHNvIHRoYXQgdHJhaWxp bmcgc3BhY2VzIGFyZSBnZW5lcmF0ZWQgb24gdGhlIGZseSByYXRoZXIgdGhhbgogIyBiZWlu ZyBjb21taXR0ZWQgYXMgc291cmNlLgogCi1leGVjIGdpdCBkaWZmLWluZGV4IC0tY2hlY2sg LS1jYWNoZWQgSEVBRCAtLQorZXhlYyBnaXQgZGlmZi1pbmRleCAtLWNoZWNrIC0tY2FjaGVk ICRoZWFkIC0tCi0tIAoyLjkuMwoK --------------F7D82DC37EC7F63BDBEE70C8--