aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-14 19:40:09 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-15 02:39:57 -0800
commitc5ab03f26c992e30f355fba129f70db0f290fcd7 (patch)
tree799ffb275675e682cc9b4375eddd7c0e70139187 /t
parent7bb1fcc6fcc5a2d0164f243fd10f346eb0822ddf (diff)
downloadgit-c5ab03f26c992e30f355fba129f70db0f290fcd7.tar.gz
git-c5ab03f26c992e30f355fba129f70db0f290fcd7.tar.xz
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 <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7607-merge-overwrite.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 513097c1a..49f4e1599 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" &&