From: Anders Melchiorsen <mail@cup.kalibalik.dk>
Date: Thu, 13 Nov 2008 23:34:03 GMT
Subject: Re: [BUG] fatal error during merge
Message-ID: <48332.N1gUGH5fRhE=.1226619243.squirrel@webmail.hotelhot.dk>
In-Reply-To: <20081113230932.GA8552@blimp.localdomain>

Alex Riesen wrote:

> Well, the case is a bit unfair: all files have the same SHA-1!

Here is an updated test, where all files have different SHA-1. It still
fails.

Your patch got rid of the errors and it commits the merged tree. But the
working tree is not updated correctly, so the moved file disappears.


Cheers,
Anders.


mkdir am-merge-fail
cd am-merge-fail
git init

mkdir before
yes | head -n100 >before/100
touch after
git add before/100 after
git commit -minitial
git branch parallel

git rm before/100 after
mkdir after
yes | head -n99 >after/99
git add after/99
git commit -mmove

git checkout parallel
echo "Just to cause a non-ff" >other
git add other
git commit -mparallel

git merge master