From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 17 Feb 2011 04:48:46 GMT
Subject: Re: git merge auto-commit doesn't fire pre-commit hook
Message-ID: <AANLkTi=DF6HiMcKA5r_HMTD3roneGZdfqFKZ_sYCy1wG@mail.gmail.com>
In-Reply-To: <6F190320-19AF-4F4A-9AE9-0DDA0839C5FD@adscale.co.nz>

On Wed, Feb 16, 2011 at 11:44 PM, Liam Clarke
<liam.clarke-hutchinson@adscale.co.nz> wrote:
> Cheers Jay.
>
>> The bypassing of pre-commit hook was and remains to be a conscious design
> decision.
>
> That doesn't sound good for my purposes. It also renders Git merge behaviour significantly surprising. :(

I agree. Note that the grandparent statement belongs to Junio, but he
also indicated at the end of the message that he didn't care too
deeply.

Personally, I think the commit hooks should fire whenever a commit is
made, regardless of the source. Maybe the hooks should move to the
low-level commit_tree, or maybe merge should invoke commit instead of
commit_tree.

j.