Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
checkout -m path: fix recreating conflicts
[gitweb.git]
/
t
/
t2000-checkout-cache-clash.sh
diff --git
a/t/t2000-checkout-cache-clash.sh
b/t/t2000-checkout-cache-clash.sh
index 5141fab7cf567fc5d16a8e9a296d2aff5f6c67e6..f7e1a735ec8699616280a086f59dc50c078bfaa7 100755
(executable)
--- a/
t/t2000-checkout-cache-clash.sh
+++ b/
t/t2000-checkout-cache-clash.sh
@@
-38,7
+38,7
@@
date >path1
test_expect_success \
'git checkout-index without -f should fail on conflicting work tree.' \
- '
!
git checkout-index -a'
+ '
test_must_fail
git checkout-index -a'
test_expect_success \
'git checkout-index with -f should succeed.' \