diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-15 04:40:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-15 11:39:57 +0100 |
| commit | c5ab03f26c992e30f355fba129f70db0f290fcd7 (patch) | |
| tree | 799ffb275675e682cc9b4375eddd7c0e70139187 /t/t7607-merge-overwrite.sh | |
| parent | modify/delete conflict resolution overwrites untracked file (diff) | |
| download | git-c5ab03f26c992e30f355fba129f70db0f290fcd7.tar.xz git-c5ab03f26c992e30f355fba129f70db0f290fcd7.zip | |
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/t7607-merge-overwrite.sh')
| -rwxr-xr-x | t/t7607-merge-overwrite.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" && |