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

From: Stefan Beller <sbeller@google.com>
Date: Sep 20, 2017, 19:55 UTC
Message-ID: <CAGZ79kaN4nKwGXq9t+Lv9e4X6qkBUAj4S8gofrNj3VZYw1sv+w@mail.gmail.com>
In-Reply-To: <1505542931.27598.4.camel@gmail.com>

On Fri, Sep 15, 2017 at 11:22 PM, Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> wrote:

Show 9 quoted lines

> 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 single parameter, the name of the file
>            that holds the proposed commit log message. Exiting with a non-zero
>            status causes the git commit** to abort.

Yes that needs an update. When writing the patch, it read ambivalently[1], such that I decided to not include the update to the man page.

[1] at the time I was reading it as "when producing a [git] commit", instead of "the command `git commit`".

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?)

>
> ---
> Kaartic