Re: hooks/post-receive-email bug?

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Jul 7, 2009, 13:33 UTC
Message-ID: <4A534E9F.3010303@drmicha.warpmail.net>
In-Reply-To: <4A520EFA.10309@xiplink.com>

Marc Branchaud venit, vidit, dixit 06.07.2009 16:49:

> Ping?
>

Pong!

Why not read the hook script yourself... but see below.

Show 50 quoted lines

> 		M.
> 
> 
> Marc Branchaud wrote:
>> Hi all,
>>
>> We currently have two main development branches: master and release. 
>> These branches exist on our shared git server.  I had to make a change
>> in both branches, so I made a topic branch off of their merge-base and
>> did the work:
>>
>>  o--o--A--B--C        <-- origin/master
>>     |\
>>     | X--Y        <-- origin/release
>>      \
>>       1--2--3        <-- topic
>>
>> I then merged topic into both master and release.  The merges were clean:
>>
>>  o--o--A--B--C---D    <-- master
>>     |\           |
>>     | X--Y----Z /    <-- release
>>      \       / /
>>       1--2--3--    <-- topic
>>
>> Then I did
>>     git push origin
>> to push matching refspecs to the origin repo.
>>
>> port-receive-email sent two messages for that push, one for each
>> branch.  Each message showed that commits 1, 2 and 3 were applied to the
>> appropriate branch:
>>
>>     The branch, release has been updated
>>            via  hash for Z (commit)
>>            via  hash for 3 (commit)
>>            via  hash for 2 (commit)
>>            via  hash for 1 (commit)
>>           from  hash for Y (commit)
>>
>> However, the details of the topic commits were missing from both
>> messages.  Instead, both only contained the details of the merge commits
>> D and Z.
>>
>> I was expecting at least one of the messages to have the details of
>> commits 1, 2 and 3.  Was I wrong to expect that?
>>
>> Thanks,
>>
>>         M.

I assume that by "pushing matching heads" you mean you did not create a topic branch on origin?

The hook tries cleverly to avoid sending multiple commit mails for the same commit. The heuristics is not completely failsafe. It seems the hook thinks these commits have been dealt with already, which usually happens when they can be reached by other refs than the one being updated.

Michael