Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t4045: abstract away SHA-1-specific constants
[gitweb.git]
/
t
/
t7607-merge-overwrite.sh
diff --git
a/t/t7607-merge-overwrite.sh
b/t/t7607-merge-overwrite.sh
index dd8ab7ede182fc3c3da840fee083bf23a94ce13c..9c422bcd7cc8c1b2525579ca3a7ffa6ee412ba42 100755
(executable)
--- a/
t/t7607-merge-overwrite.sh
+++ b/
t/t7607-merge-overwrite.sh
@@
-92,7
+92,7
@@
test_expect_success 'will not overwrite removed file with staged changes' '
test_cmp important c1.c
'
-test_expect_
success
'will not overwrite unstaged changes in renamed file' '
+test_expect_
failure
'will not overwrite unstaged changes in renamed file' '
git reset --hard c1 &&
git mv c1.c other.c &&
git commit -m rename &&