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

[Noam Postavsky]

On Sat, Apr 29, 2017 at 3:15 PM, Eli Zaretskii <address@hidden> 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).