Re: [BUG] fatal error during merge

From: SZEDER Gábor <szeder@ira.uka.de>
Date: Nov 13, 2008, 14:53 UTC
Message-ID: <20081113145325.GD29274@neumann>
In-Reply-To: <2008-11-13-15-26-33+trackit+sam@rfc1149.net>

Hi,

On Thu, Nov 13, 2008 at 03:26:33PM +0100, Samuel Tardieu wrote:

Show 8 quoted lines

> * SZEDER Gábor <szeder@ira.uka.de> [2008-11-13 15:03:23 +0100]
> | Yeah, and it can be bisected to commit 621ff675 (rev-parse: fix
> | meaning of rev~ vs rev~0, 2008-03-14), which is from Linus, so put him
> | on Cc.
> 
> I think your pinpointed a change of behaviour in "HEAD~", which is
> probably not the problem at hand.  To find the real bug, you should
> update the test script so that it uses "HEAD~1" instead of "HEAD~".

It doesn't matter. The test script errors out at the merge, and not at the checkout. Furthermore, it doesn't matter, whether HEAD~, HEAD~, or HEAD^ is checked out, the results are the same.

But yes, it's possible that not the bisected commit is the culprit, but something in or behind merge relies on the old undocumented and illogical behaviour.

Gábor