Re: [PATCH] Add post-merge hook.

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 4, 2007, 17:25 UTC
Message-ID: <7vmyw2ny05.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1188923110.6192.15.camel@beauty>

"Josh England" <jjengla@sandia.gov> writes:

Show 7 quoted lines

>> Two questions.
>> 
>>  * Do you want to run the post-merge hook even for a squash
>>    merge?
>
> Yes.  I'd like to run it at any time that the working tree might be
> updated.

If that is the case, perhaps your hook may want to get a parameter to tell it what kind of "git-merge" invocation it was? Squash merge does not even advance the HEAD and is of a very different nature from a normal merge.

Show 6 quoted lines

>>  - We would want a new test in the test suite for this, to make
>>    sure that later changes by others would not break this new
>>    feature you would depend upon.
>
> Can do.  You want me to resubmit the original patch along with tests or
> submit the tests as a new patch?

I'd like a full resend whenever I reject a patch with a comment. That way the patch will be easier to review with context by other people.

Thanks.