Re: [PATCH] git-merge: run commit hooks when making merge commits

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 11, 2007, 21:26 UTC
Message-ID: <7vd4yy4opa.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <11841499201242-git-send-email-sam.vilain@catalyst.net.nz>

Sam Vilain <sam.vilain@catalyst.net.nz> writes:

Show 7 quoted lines

> git-merge.sh was not running the commit hooks, so run them in the two
> places where we go to commit.
>
> Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
> ---
>    Not sure if it should call these or some specialist hooks, like
>    git-am does.

I suspect some people have pre-commit scripts that have been meant to catch style errors for their own commits, and invoking that on merge would wreak havoc --- there is not much you can do if you want to get the work done by somebody else at that point. Introducing a new pre-merge-commit hook would probably be safer; if one wants to use the same check as one's pre-commit does, the new hook in the repository can exec $GIT_DIR/hooks/pre-commit.

The commit-msg hook I have no clue what people usually use it for in the real world, but a merge commit message tends to be quite different from the message you would give to your own straight line commits, so custom reformatting rules people have in commit-msg hook may not apply to merge commit messages.

Same for post-commit, but probably to lessor extent, as I suspect people use that mostly for per-commit notification mechanism.