Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make)

[Eli Zaretskii <eliz@gnu.org>]

> From: Noam Postavsky <npostavs@users.sourceforge.net>
> Date: Sun, 30 Apr 2017 15:35:55 -0400
> Cc: Paul Eggert <eggert@cs.ucla.edu>, martin rudalics <rudalics@gmx.at>, 
> 	Emacs developers <emacs-devel@gnu.org>, Andreas Schwab <schwab@suse.de>, Yuri Khan <yuri.v.khan@gmail.com>
> 
> On Sat, Apr 29, 2017 at 10:34 PM, Eli Zaretskii <eliz@gnu.org> 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.