summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-17 01:17:46 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-17 01:52:48 -0700
commitfcc387db9bc453dc7e07a262873481af2ee9e5c8 (patch)
treea3853842dc72ee181a0f548aa2a9ba0105464fd5 /t/t6022-merge-rename.sh
parent63dffdf03da65ddf1a02c3215ad15ba109189d42 (diff)
downloadgit-fcc387db9bc453dc7e07a262873481af2ee9e5c8.tar.gz
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>
Diffstat (limited to 't/t6022-merge-rename.sh')
-rwxr-xr-xt/t6022-merge-rename.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index a2d24b5ca9..5ac25647ab 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -111,6 +111,7 @@ test_expect_success 'pull renaming branch into unrenaming one' \
test_expect_success 'pull renaming branch into another renaming one' \
'
+ rm -f B
git reset --hard
git checkout red
git pull . white && {