From: SZEDER Gábor <szeder@ira.uka.de>
Date: Thu, 13 Nov 2008 14:03:23 GMT
Subject: Re: [BUG] fatal error during merge
Message-ID: <20081113140323.GA10267@neumann>
In-Reply-To: <2008-11-13-14-23-19+trackit+sam@rfc1149.net>

Hi,

On Thu, Nov 13, 2008 at 02:23:19PM +0100, Samuel Tardieu wrote:
> >>>>> "Anders" == Anders Melchiorsen <mail@cup.kalibalik.dk> writes:
> 
> Anders> I have tested the script with Git 1.6.0.2, but the real
> Anders> scenario that made this appear seems to also fail with master
> Anders> and next from git.git.
> 
> I confirm that your test case also fails with the current "next".

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.


Best,
Gábor