Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
do not overwrite files in leading path
[gitweb.git]
/
t
/
t7607-merge-overwrite.sh
diff --git
a/t/t7607-merge-overwrite.sh
b/t/t7607-merge-overwrite.sh
index f8e8ff0b6fcc078ae5c683d858a82e154f442427..d4a499dee2ec3daabdba75eb6185778567204b0b 100755
(executable)
--- a/
t/t7607-merge-overwrite.sh
+++ b/
t/t7607-merge-overwrite.sh
@@
-100,7
+100,7
@@
test_expect_success 'will not overwrite untracked subtree' '
test_cmp important sub/f/important
'
-test_expect_
failure
'will not overwrite untracked file in leading path' '
+test_expect_
success
'will not overwrite untracked file in leading path' '
git reset --hard c0 &&
rm -rf sub &&
cp important sub &&