From: Junio C Hamano <junkio@cox.net>
Date: Thu, 16 Nov 2006 11:32:50 GMT
Subject: Re: Git can't merge two identical move file operation
Message-ID: <7v1wo3bp99.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <6e1787fe0611160226r2d51d980t6899f1a1018b5fe5@mail.gmail.com>

"Alexander Litvinov" <litvinov2004@gmail.com> writes:

> Here is the example script:
>>git version
> git version 1.4.4
>> mkdir 1 && cd 1 && git init-db
> defaulting to local storage area
>> echo 1 > a && git add a && git commit -a -m '1'
> Committing initial tree 2ce1eef76631e82282e0f7f0cf9e6f3e9a4a0b1e

Could you try an exactly the same sequence except to make the
initial contents of the file 'a' a bit more meaningful (I
typically use COPYING file in git.git repository for something
like this), by replacing the above "echo 1 > a ..." line with:

	$ cat COPYING >a && git add a && git commit -a -m '1'

and see if it still breaks?  You do not need to change the later
modification to the file (i.e. "echo 2 >>a"), but only the above
single line change.