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: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) Date: Sat, 29 Apr 2017 14:00:26 -0400 Message-ID: References: <955c464e-5833-10fd-9c02-d7edda70e488@cs.ucla.edu> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=94eb2c18d24e02d3d4054e51f74d X-Trace: blaine.gmane.org 1493488874 16007 195.159.176.226 (29 Apr 2017 18:01:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 29 Apr 2017 18:01:14 +0000 (UTC) Cc: martin rudalics , emacs-devel , Andreas Schwab , Yuri Khan To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 29 20:01:08 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 1d4Wg7-00040e-5M for ged-emacs-devel@m.gmane.org; Sat, 29 Apr 2017 20:01:07 +0200 Original-Received: from localhost ([::1]:41902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4WgC-0004yY-Pg for ged-emacs-devel@m.gmane.org; Sat, 29 Apr 2017 14:01:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4WfV-0004yH-GC for emacs-devel@gnu.org; Sat, 29 Apr 2017 14:00:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4WfU-0004a8-BC for emacs-devel@gnu.org; Sat, 29 Apr 2017 14:00:29 -0400 Original-Received: from mail-oi0-x230.google.com ([2607:f8b0:4003:c06::230]:32936) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4WfU-0004Zm-4A for emacs-devel@gnu.org; Sat, 29 Apr 2017 14:00:28 -0400 Original-Received: by mail-oi0-x230.google.com with SMTP id y11so56413782oie.0 for ; Sat, 29 Apr 2017 11:00:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=SiXlAPeEy20EhEoJpvHV9Uduo5V1j8b8265r50M77OU=; b=Vw8I5YgRgfYAHoZETcG44h8yBtdkedXi1ELtRjTsojddzGf6tKzP1hxm02K7jHtx3X 3mtmFGJ24892hW057KtJwHhYFW36MmJcoO2+cT8epAqd1RzSOpoIki3QuAo0Dl2USnp3 Bj7N2sGH9kC2WUEnh2rKVNPqm+UZApTb/+yfxuPl/yjmiPDIZw3qQOUcqBeddb/Bct5s 7i/S/bBrUidsS3JJpcLT+62I9+iD0IapPKMvB8DlF1gSGaAXm+kjtcEBGNMHlJmJHg1l FeS2bfB5STB45uCGVThVEwG3KNMfDNgg/H3ao5D1ys55h3aWh2a1SlwC7j+yKdqj5vK0 f85Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=SiXlAPeEy20EhEoJpvHV9Uduo5V1j8b8265r50M77OU=; b=YBhsqYVGYM7RMXpX2DQkq7XevaNfIBwDl7qc2vSGDaoNwAU5LD2MvoOreNbxkaN3sB lfW5fdO6nFok2FdyjDRRf5lASQF5C578gAs/Kj/mdZ97z4WWv2DZtHP1zhCDPeYhRwfq hRDKgALmVxdnVm+J0CB3Y0c8bAZ/V5QdrOWfjwBn9Ics/T7Eb9Dpip7jJECMntnaxPHo 1d0t89zkWphA8ld+LUNbyDbUT+YfSQR3EgKzyRat7ibu9zpKCF7O9glYzIu6jfl7P86O Ex241DbDLk+4cT61UHOlc6nJOZOhk46V7gC2N5QgtIGaF3xJXq7xKQXhOe8lSypgzP7s NHRQ== X-Gm-Message-State: AN3rC/6FM5SaM2RcDDrY4AP2qU35xENPwl8tlhElbmfTyjyDZiTVns+G L+MlpLRRlcMdpgPwd2/AXa0xlx59bw== X-Received: by 10.202.5.195 with SMTP id 186mr6616175oif.59.1493488826987; Sat, 29 Apr 2017 11:00:26 -0700 (PDT) Original-Received: by 10.157.25.10 with HTTP; Sat, 29 Apr 2017 11:00:26 -0700 (PDT) In-Reply-To: <955c464e-5833-10fd-9c02-d7edda70e488@cs.ucla.edu> X-Google-Sender-Auth: lGF_ilNEIMaO8QUlyEHvGln0gRU 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:214416 Archived-At: --94eb2c18d24e02d3d4054e51f74d Content-Type: text/plain; charset=UTF-8 On Wed, Apr 12, 2017 at 2:26 PM, Paul Eggert 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? Since git only runs the hooks on the merged changes when you pass --no-commit to 'git merge', defaulting to non-blind merge doesn't really work anyway. There I propose the opposite default, as in the attached (also you had a copy-pasto "; done" in your patch). --94eb2c18d24e02d3d4054e51f74d Content-Type: text/x-patch; charset=US-ASCII; name="v2-0001-Allow-bypassing-of-some-checks-when-merging.patch" Content-Disposition: attachment; filename="v2-0001-Allow-bypassing-of-some-checks-when-merging.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j23kn3tq1 RnJvbSA4MjRlMWJhYzdkZTM2NTcwOGU5MmUyMmI1YWEyNjI0ZTZiZjdiZDllIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QFBlbmd1aW4uQ1MuVUNMQS5F RFU+CkRhdGU6IFdlZCwgMTIgQXByIDIwMTcgMTE6MjQ6NDEgLTA3MDAKU3ViamVjdDogW1BBVENI IHYyXSBBbGxvdyBieXBhc3Npbmcgb2Ygc29tZSBjaGVja3Mgd2hlbiBtZXJnaW5nCgoqIGJ1aWxk LWF1eC9naXQtaG9va3MvcHJlLWNvbW1pdDogRG9uJ3QgY2hlY2sgbWVyZ2VkIGluIGNoYW5nZXMg dW5sZXNzCkdJVF9NRVJHRV9DQVJFRlVMTFkgaXMgdHJ1ZS4KKiBhZG1pbi9ub3Rlcy9yZXBvOiBF eHBsYWluIGhvdyB0byB1c2UgR0lUX01FUkdFX0NBUkVGVUxMWS4KLS0tCiBhZG1pbi9ub3Rlcy9y ZXBvICAgICAgICAgICAgICAgfCAgNyArKysrKysrCiBidWlsZC1hdXgvZ2l0LWhvb2tzL3ByZS1j b21taXQgfCAyMiArKysrKysrKysrKysrKysrKysrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI2IGlu c2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYWRtaW4vbm90ZXMvcmVw byBiL2FkbWluL25vdGVzL3JlcG8KaW5kZXggM2FiM2RhNzgwNy4uMjQxNjU2M2Y4MyAxMDA2NDQK LS0tIGEvYWRtaW4vbm90ZXMvcmVwbworKysgYi9hZG1pbi9ub3Rlcy9yZXBvCkBAIC03Niw2ICs3 NiwxMyBAQCBjb25mbGljdCBieSBjaG9vc2luZyBlaXRoZXIgdGhlIG1hc3RlciBvciBicmFuY2gg dmVyc2lvbiwgdGhlbiBydW4KICdtYWtlIC1DIGxpc3AgYXV0b2xvYWRzJyB0byB1cGRhdGUgdGhl IG1kNXN1bXMgdG8gdGhlIGNvcnJlY3QgbWFzdGVyCiB2YWx1ZSBiZWZvcmUgY29tbWl0dGluZy4K IAorKiBSdW5uaW5nIGdpdCBjb21taXQgaG9va3Mgb24gbWVyZ2VkIGNoYW5nZXMKKworTm9ybWFs bHkgZ2l0IGRvZXMgbm90IHJ1biB0aGUgcHJlLWNvbW1pdCBob29rIG9uIG1lcmdlZCBjaGFuZ2Vz LiAgSW4KK29yZGVyIHRvIHJ1biB0aGUgaG9va3Mgb24gdGhlIGJyYW5jaCBiZWluZyBtZXJnZWQg aW4sIHNldCB0aGUKK2Vudmlyb25tZW50IHZhcmlhYmxlIEdJVF9NRVJHRV9DQVJFRlVMTFkgdG8g J3RydWUnLCBhbmQgdGhlCisnLS1uby1jb21taXQnIG9wdGlvbiB0byB0aGUgJ2dpdCBtZXJnZScg Y2FsbC4KKwogKiBSZS1hZGRpbmcgYSBmaWxlIHRoYXQgaGFzIGJlZW4gcmVtb3ZlZCBmcm9tIHRo ZSByZXBvc2l0b3J5CiAKIExldCdzIHN1cHBvc2UgeW91J3ZlIGRvbmU6CmRpZmYgLS1naXQgYS9i dWlsZC1hdXgvZ2l0LWhvb2tzL3ByZS1jb21taXQgYi9idWlsZC1hdXgvZ2l0LWhvb2tzL3ByZS1j b21taXQKaW5kZXggNjQ4M2JmYzZiMy4uNTliZmY3OWRmMSAxMDA3NTUKLS0tIGEvYnVpbGQtYXV4 L2dpdC1ob29rcy9wcmUtY29tbWl0CisrKyBiL2J1aWxkLWF1eC9naXQtaG9va3MvcHJlLWNvbW1p dApAQCAtMjUsMTYgKzI1LDMyIEBAIExDX0FMTD0KIAogLiBnaXQtc2gtc2V0dXAKIAorIyBVbmxl c3MgR0lUX01FUkdFX0NBUkVGVUxMWSBpcyAndHJ1ZScsIHRoZW4gd2hlbiBkb2luZyBhIHR3by13 YXkgbWVyZ2UsCisjIGlnbm9yZSBwcm9ibGVtcyB0aGF0IGNhbWUgZnJvbSB0aGUgb3RoZXIgc2lk ZSBvZiB0aGUgbWVyZ2UuCitoZWFkPUhFQUQKK2lmIHRlc3QgLWUgIiRHSVRfRElSIi9NRVJHRV9I RUFEICYmIHRlc3QgIiRHSVRfTUVSR0VfQ0FSRUZVTExZIiAhPSB0cnVlOyB0aGVuCisgIG1lcmdl X2hlYWRzPWBjYXQgIiRHSVRfRElSIi9NRVJHRV9IRUFEYCB8fCBleGl0CisgIGZvciBtZXJnZV9o ZWFkIGluICRtZXJnZV9oZWFkczsgZG8KKyAgICBjYXNlICRoZWFkIGluCisgICAgICBIRUFEKSBo ZWFkPSRtZXJnZV9oZWFkOzsKKyAgICAgICMgRm9yIG11bHRpLWhlYWQgbWVyZ2VzLCB0aGVyZSdz IG5vIGVhc3kgd2F5IHRvIGlnbm9yZSBtZXJnZWQgaW4KKyAgICAgICMgY2hhbmdlcy4gIEJ1dCBp ZiB5b3UncmUgZG9pbmcgbXVsdGktaGVhZCBtZXJnZXMsIHByZXN1bWFibHkKKyAgICAgICMgeW91 IGtub3cgaG93IHRvIGhhbmRsZSBhbnkgZW5zdWluZyBwcm9ibGVtcy4KKyAgICAgICopIGhlYWQ9 SEVBRDsgYnJlYWs7OworICAgIGVzYWMKKyAgZG9uZQorZmkKKwogZ2l0X2RpZmY9J2dpdCBkaWZm IC0tY2FjaGVkIC0tbmFtZS1vbmx5IC0tZGlmZi1maWx0ZXI9QScKIG9rX2NoYXJzPSdcMCtbPS09 XS4vMC05QS1aX2EteicKLW5iYWRjaGFycz1gJGdpdF9kaWZmIC16IEhFQUQgfCB0ciAtZCAiJG9r X2NoYXJzIiB8IHdjIC1jYAorbmJhZGNoYXJzPWAkZ2l0X2RpZmYgLXogJGhlYWQgfCB0ciAtZCAi JG9rX2NoYXJzIiB8IHdjIC1jYAogCiBpZiB0ZXN0ICIkbmJhZGNoYXJzIiAtbmUgMDsgdGhlbgog ICBlY2hvICJGaWxlIG5hbWUgZG9lcyBub3QgY29uc2lzdCBvZiAtKy4vXyBvciBBU0NJSSBsZXR0 ZXJzIG9yIGRpZ2l0cy4iCiAgIGV4aXQgMQogZmkKIAotZm9yIG5ld19uYW1lIGluIGAkZ2l0X2Rp ZmYgSEVBRGA7IGRvCitmb3IgbmV3X25hbWUgaW4gYCRnaXRfZGlmZiAkaGVhZGA7IGRvCiAgIGNh c2UgJG5ld19uYW1lIGluCiAgICAgLSogfCAqLy0qKQogICAgICAgZWNobyAiJG5ld19uYW1lOiBG aWxlIG5hbWUgY29tcG9uZW50IGJlZ2lucyB3aXRoICctJy4iCkBAIC01Myw0ICs2OSw0IEBAIG5i YWRjaGFycz0KICMgdGVzdHMgc28gdGhhdCB0cmFpbGluZyBzcGFjZXMgYXJlIGdlbmVyYXRlZCBv biB0aGUgZmx5IHJhdGhlciB0aGFuCiAjIGJlaW5nIGNvbW1pdHRlZCBhcyBzb3VyY2UuCiAKLWV4 ZWMgZ2l0IGRpZmYtaW5kZXggLS1jaGVjayAtLWNhY2hlZCBIRUFEIC0tCitleGVjIGdpdCBkaWZm LWluZGV4IC0tY2hlY2sgLS1jYWNoZWQgJGhlYWQgLS0KLS0gCjIuMTEuMQoK --94eb2c18d24e02d3d4054e51f74d--