Merge branch 'jk/commit-v-strip'

diff --git a/t/t2100-update-cache-badpath.sh b/t/t2100-update-cache-badpath.sh
index 04a1ed1a6b9dd4eabc2b95d348b77b0fd08b0da4..6ef2dcfd8afece86aaf6345630179af179eb2ed9 100755 (executable)
--- a/t/t2100-update-cache-badpath.sh
+++ b/t/t2100-update-cache-badpath.sh
@@ -44,8 +44,8 @@ date >path1/file1
 
 for p in path0/file0 path1/file1 path2 path3
 do
-       test_expect_failure \
+       test_expect_success \
            "git update-index to add conflicting path $p should fail." \
-           "git update-index --add -- $p"
+           "test_must_fail git update-index --add -- $p"
 done
 test_done