Code

read-tree -m -u: do not overwrite or remove untracked working tree files.
authorJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 08:17:46 +0000 (01:17 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 08:52:48 +0000 (01:52 -0700)
commitfcc387db9bc453dc7e07a262873481af2ee9e5c8
treea3853842dc72ee181a0f548aa2a9ba0105464fd5
parent63dffdf03da65ddf1a02c3215ad15ba109189d42
read-tree -m -u: do not overwrite or remove untracked working tree files.

When a merge results in a creation of a path that did not exist
in HEAD, and if you already have that path on the working tree,
because the index has not been told about the working tree file,
read-tree happily removes it.  The issue was brought up by Santi
BĂ©jar on the list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
read-tree.c
t/t1002-read-tree-m-u-2way.sh
t/t3500-cherry.sh
t/t4002-diff-basic.sh
t/t6022-merge-rename.sh