checkout -m path: fix recreating conflicts

diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh
index b25a77f910fcdd589775ce901bdf878c23677dd4..42bf518c68e6ef07c8be1af714723b2f900a573c 100755 (executable)
--- a/t/t7103-reset-bare.sh
+++ b/t/t7103-reset-bare.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-reset in a bare repository'
+test_description='git reset in a bare repository'
 . ./test-lib.sh
 
 test_expect_success 'setup non-bare' '
@@ -17,7 +17,7 @@ test_expect_success 'setup bare' '
 '
 
 test_expect_success 'hard reset is not allowed' '
-       ! git reset --hard HEAD^
+       test_must_fail  git reset --hard HEAD^
 '
 
 test_expect_success 'soft reset is allowed' '