Re: [PATCHv3] builtin/merge: honor commit-msg hook for merges

2017-09-20 Thread Junio C Hamano
Stefan Beller writes: > I'll send a patch fixing the docs, though with this thought, maybe we need > to fix other commands, that produce commits as well? > (git revert, others?) I do not think "commands that create commits" is not a good criteria. "git notes" and "git stash" would (internally)

Re: [PATCHv3] builtin/merge: honor commit-msg hook for merges

2017-09-20 Thread Stefan Beller
On Fri, Sep 15, 2017 at 11:22 PM, Kaartic Sivaraam wrote: > Seems 'Documentation/githooks.txt' needs an update related to this > change. Previously it said(note the **s) that 'commit-msg' is invoked > only by 'git commit', > > commit-msg >This hook is invoked by git commit**, and c

Re: [PATCHv3] builtin/merge: honor commit-msg hook for merges

2017-09-15 Thread Kaartic Sivaraam
Seems 'Documentation/githooks.txt' needs an update related to this change. Previously it said(note the **s) that 'commit-msg' is invoked only by 'git commit', commit-msg This hook is invoked by git commit**, and can be bypassed with the --no-verify option. It takes a sing

Re: [PATCHv3] builtin/merge: honor commit-msg hook for merges

2017-09-11 Thread Stefan Beller
On Thu, Sep 7, 2017 at 6:13 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> The --no-verify option however is not remembered across invocations >> of git-merge. Originally the author assumed an alternative in which the >> 'git merge --continue' command accepts the --no-verify flag, bu

Re: [PATCHv3] builtin/merge: honor commit-msg hook for merges

2017-09-07 Thread Junio C Hamano
Stefan Beller writes: > The --no-verify option however is not remembered across invocations > of git-merge. Originally the author assumed an alternative in which the > 'git merge --continue' command accepts the --no-verify flag, but that > opens up the discussion which flags are allows to th

[PATCHv3] builtin/merge: honor commit-msg hook for merges

2017-09-07 Thread Stefan Beller
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14) merge should also honor the commit-msg hook: When a merge is stopped due to conflicts or --no-commit, the subsequent commit calls the commit-msg hook. However, it is not called after a clean merge. Fix this inconsistency by i