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 15:54:41 -0400 Message-ID: References: <955c464e-5833-10fd-9c02-d7edda70e488@cs.ucla.edu> <83shkrkote.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1493495692 16599 195.159.176.226 (29 Apr 2017 19:54:52 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 29 Apr 2017 19:54:52 +0000 (UTC) Cc: martin rudalics , Yuri Khan , Paul Eggert , Andreas Schwab , Emacs developers To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 29 21:54:48 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 1d4YS8-0004AE-Fo for ged-emacs-devel@m.gmane.org; Sat, 29 Apr 2017 21:54:48 +0200 Original-Received: from localhost ([::1]:42276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4YSB-0003Og-38 for ged-emacs-devel@m.gmane.org; Sat, 29 Apr 2017 15:54:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4YS4-0003OT-Vc for emacs-devel@gnu.org; Sat, 29 Apr 2017 15:54:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4YS4-0004Z0-3j for emacs-devel@gnu.org; Sat, 29 Apr 2017 15:54:45 -0400 Original-Received: from mail-oi0-x22b.google.com ([2607:f8b0:4003:c06::22b]:33875) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4YS2-0004Y6-Ge; Sat, 29 Apr 2017 15:54:42 -0400 Original-Received: by mail-oi0-x22b.google.com with SMTP id x184so57895180oia.1; Sat, 29 Apr 2017 12:54:42 -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=p6QnHt5Q7zHx4M0Egpv+kIUNSV1iChNgveVixvvWRd4=; b=iMFU4OiizIvyB65ZUuOdd3deUegVCnveNHIlCiyqLOTzqDztAOyVLl7i9EuTlEbl9R 3u5j1tsoITVA3NAEaY8ln5mj+7FlYWjIQOQoRvgU4GdacHlZf2U2/Wtw7gKI0GPqXzRM T7CV1scdOceVapZGx+AZ/EC/9ZZScUnIzTmJb0EpX8E7Tg5og1Bxn1ugZpqnZAr+EzUy GOXGqQLv2u+HkfFq0dtJ8iyuDaqWbxGMf3yeIGuhpAtohpiCOFTRUFJTxXnIIdqq/qk5 QXDiQk1T2LHU7FqrZdzKa2UqRz49dHF/QwaHxWDffC4SUVAbMTwbMr+2Um4fcjk65GWi +qVw== 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=p6QnHt5Q7zHx4M0Egpv+kIUNSV1iChNgveVixvvWRd4=; b=fTF4PZVIOxJwWKZMrztCvuk5FopeyDDkw5A8ZcNHmTzvtMjJJTwW0YTCHlGCdcfs8C XoveXjszuiuCfFCVOGxRtleFaJUIiOKe3qXNGv3/Y6ucEoi3pcmu+Nn04YkpocHwl84f NzflOM9BwKn/7BZO/YrEinpGOOK5cW7bH/7gq78wlKVxzd31HF7UEbdYvYy/BJmdOwuY Xw7L3kAR7/QIi8Ykf5J0XFa5W/aD2BiODvasrpywXyXi+M1opIm0i4RyLLMGxNX7jULh VZEfCrvPll1XOMV+qP7MoJH9u0rDgheVUEn8Bd5lm7B0f43YhclLYWjpW4i2CegpUF9Y rTig== X-Gm-Message-State: AN3rC/5zgIkkewjjw7KISI8vK+r2cHjpYy9YFVQ2hInAMls1Sqn26GlQ qPzmlBr4S8duvVWn5H5VeaA/LS+lbg== X-Received: by 10.157.15.205 with SMTP id m13mr7488585otd.6.1493495681625; Sat, 29 Apr 2017 12:54:41 -0700 (PDT) Original-Received: by 10.157.25.10 with HTTP; Sat, 29 Apr 2017 12:54:41 -0700 (PDT) In-Reply-To: <83shkrkote.fsf@gnu.org> X-Google-Sender-Auth: ozt9xCJt1tN-ojGEQ3FfZveFyxk X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::22b 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:214425 Archived-At: On Sat, Apr 29, 2017 at 3:15 PM, Eli Zaretskii wrote: >> > 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. >> >> Thanks for looking into this. I guess I'll have to rethink how I merge. > > Not sure it matters in the context of this discussion, but please keep > in mind that "git cherry-pick" also merges. My intuition is that getting a commit hook failure from the commit being cherry picked will be less confusing than getting hook failures from one of the many commits being merged from a branch, so I don't think it's worth updating the hook to avoid this case. 'git cherry-pick' does have the same issue as 'git merge': it won't rerun the commit hook, unless '--no-commit' is passed (or something else prevents the auto-commit, e.g., a conflict, or $EDITOR failing due to lack of terminal).