From c5ab03f26c992e30f355fba129f70db0f290fcd7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 14 Dec 2008 19:40:09 -0800 Subject: merge-recursive: do not clobber untracked working tree garbage When merge-recursive wanted to create a new file in the work tree (either as the final result, or a hint for reference purposes while delete/modify conflicts), it unconditionally overwrote an untracked file in the working tree. Be careful not to lose whatever the user has that is not tracked. Signed-off-by: Junio C Hamano --- t/t7607-merge-overwrite.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 513097c1a1..49f4e1599a 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -53,7 +53,7 @@ test_expect_success 'will not overwrite staged changes' ' test_cmp important c2.c ' -test_expect_failure 'will not overwrite removed file' ' +test_expect_success 'will not overwrite removed file' ' git reset --hard c1 && git rm c1.c && git commit -m "rm c1.c" && -- cgit v1.2.3