Merge branch 'maint-1.7.0' into maint

[git.git] / t / t1503-rev-parse-verify.sh

diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index a0d14cb9c382d840f16f0c661d79ef04336dc63a..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,32 +83,25 @@ 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)"
 '
 
-test_expect_success '1 with --default' '
+test_expect_success 'use --default' '
        git rev-parse --verify --default master &&
        git rev-parse --verify --default master HEAD &&
        git rev-parse --default master --verify &&
        git rev-parse --default master --verify HEAD &&
+       git rev-parse --verify HEAD --default master &&
        test_must_fail git rev-parse --verify foo --default master &&
        test_must_fail git rev-parse --default HEAD --verify bar &&
-       test_must_fail git rev-parse --verify --default HEAD baz
-'
-
-test_expect_failure '2 with --default' '
-       git rev-parse --verify HEAD --default master
+       test_must_fail git rev-parse --verify --default HEAD baz &&
+       test_must_fail git rev-parse --default foo --verify &&
+       test_must_fail git rev-parse --verify --default bar
 '
 
 test_done