From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) Date: Sun, 30 Apr 2017 22:40:15 +0300 Message-ID: <83tw55k7kw.fsf@gnu.org> References: <955c464e-5833-10fd-9c02-d7edda70e488@cs.ucla.edu> <83shkrkote.fsf@gnu.org> <83mvazkmk1.fsf@gnu.org> <83k262lj2j.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1493581324 32573 195.159.176.226 (30 Apr 2017 19:42:04 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 30 Apr 2017 19:42:04 +0000 (UTC) Cc: rudalics@gmx.at, yuri.v.khan@gmail.com, eggert@cs.ucla.edu, schwab@suse.de, emacs-devel@gnu.org To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 30 21:41:59 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 1d4ujH-0008Fi-GD for ged-emacs-devel@m.gmane.org; Sun, 30 Apr 2017 21:41:59 +0200 Original-Received: from localhost ([::1]:45724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4ujI-0003bn-BR for ged-emacs-devel@m.gmane.org; Sun, 30 Apr 2017 15:42:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4uiU-0003ap-BB for emacs-devel@gnu.org; Sun, 30 Apr 2017 15:41:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4uiT-0002mT-HK for emacs-devel@gnu.org; Sun, 30 Apr 2017 15:41:10 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4uiM-0002kU-RL; Sun, 30 Apr 2017 15:41:02 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2642 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d4uiJ-0007b4-Ng; Sun, 30 Apr 2017 15:41:02 -0400 In-reply-to: (message from Noam Postavsky on Sun, 30 Apr 2017 15:35:55 -0400) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:214451 Archived-At: > From: Noam Postavsky > Date: Sun, 30 Apr 2017 15:35:55 -0400 > Cc: Paul Eggert , martin rudalics , > Emacs developers , Andreas Schwab , Yuri Khan > > On Sat, Apr 29, 2017 at 10:34 PM, Eli Zaretskii wrote: > > > > I mean that users will be surprised to see the hooks invoked when > > cherry-picking. I know I was surprised to see the git-merge-changelog > > utility to be invoked the first time I cherry-picked. > > I don't see where git-merge-changelog is being called from the hooks. It isn't. The fact that it's invoked during cherry-picking is an indication that cherry-picking involves a merge. I'm saying that the first time I realized that, it was a surprise. Which means others might be surprised to see the hooks invoked when they cherry-pick. > With respect to the pre-commit hook, it seems that we can't play the > same trick as with 'git merge', because CHERRY_PICK_HEAD doesn't exist > when picking only one commit. Yeah, figured that much. Too bad.