Re: Git can't merge two identical move file operation

"Alexander Litvinov" [off-list ref] writes:

Here is the example script:

quoted

git version

git version 1.4.4

quoted

mkdir 1 && cd 1 && git init-db

defaulting to local storage area

quoted

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.

(no body)

В сообщении от Thursday 16 November 2006 17:32 Junio C Hamano написал(a):

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.

Wow, that a magic ! It works !

В сообщении от Thursday 16 November 2006 17:32 Junio C Hamano написал(a):

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.

Wow, that a magic ! It works !

Thanks for help.