Merge branch 'maint'

diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index e93f1b38ef5a1af47fb962078d86f3a1cc35b10d..cc6539494737fff8a02460b6cdca3fccad8f770f 100755 (executable)
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -23,7 +23,7 @@ add_line_into_file()
     fi
 
     test_tick
-    git-commit --quiet -m "$MSG" $_file
+    git commit --quiet -m "$MSG" $_file
 }
 
 HASH1=
@@ -83,17 +83,11 @@ test_expect_success 'fails silently when using -q' '
        test -z "$(cat error)"
 '
 
-test_expect_success '1 no stdout output on error' '
+test_expect_success 'no stdout output on error' '
        test -z "$(git rev-parse --verify)" &&
        test -z "$(git rev-parse --verify foo)" &&
-       test -z "$(git rev-parse --verify baz HEAD)"
-'
-
-test_expect_failure '2 no stdout output on error' '
-       test -z "$(git rev-parse --verify HEAD bar)"
-'
-
-test_expect_failure '3 no stdout output on error' '
+       test -z "$(git rev-parse --verify baz HEAD)" &&
+       test -z "$(git rev-parse --verify HEAD bar)" &&
        test -z "$(git rev-parse --verify $HASH2 HEAD)"
 '