summaryrefslogtreecommitdiff
path: root/t/t3500-cherry.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/t3500-cherry.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/t3500-cherry.sh')
-rwxr-xr-xt/t3500-cherry.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh
index b141f89de2..e83bbee074 100755
--- a/t/t3500-cherry.sh
+++ b/t/t3500-cherry.sh
@@ -30,6 +30,7 @@ test_expect_success \
git-commit -m "Add C." &&
git-checkout -f master &&
+ rm -f B C &&
echo Third >> A &&
git-update-index A &&