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

[Eli Zaretskii]

> From: Noam Postavsky <address@hidden>
> Date: Sat, 29 Apr 2017 19:25:17 -0400
> Cc: Paul Eggert <address@hidden>, martin rudalics <address@hidden>, 
>       Emacs developers <address@hidden>, Andreas Schwab <address@hidden>, 
> Yuri Khan <address@hidden>
> 
> On Sat, Apr 29, 2017 at 4:04 PM, Eli Zaretskii <address@hidden> wrote:
> >>
> >> 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.
> >
> > I don't think I agree.  In fact, I think many users will not even
> > realize that cherry-pick merges, and will be surprised.
> 
> Hmm, I'm not sure I entirely understand what you're getting at. What
> exactly do you mean by "merges" in this context?

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.