Merge branch 'mk/complete-tcsh'

diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 3ed7558c1ecd074504c6a8699bd599033b1ba84d..6b3d797ceabad069aefd1337ffe366b86b523412 100755 (executable)
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -98,7 +98,7 @@ test_expect_success 'disambiguate commit-ish' '
 '
 
 test_expect_success 'disambiguate commit' '
-       commit=$(echo "j9xqh" | git commit-tree 0000000000cdc -p 000000000) &&
+       commit=$(echo "hoaxj" | git commit-tree 0000000000cdc -p 000000000) &&
        test $(git rev-parse $commit^) = $(git rev-parse 0000000000e4f)
 '
 
@@ -254,10 +254,10 @@ test_expect_success 'ambiguous commit-ish' '
 
 test_expect_success 'rev-parse --disambiguate' '
        # The test creates 16 objects that share the prefix and two
-       # commits created by commit-tree in earlier tests do not share
-       # the prefix.
+       # commits created by commit-tree in earlier tests share a
+       # different prefix.
        git rev-parse --disambiguate=000000000 >actual &&
-       test "$(wc -l <actual)" = 16 &&
+       test $(wc -l <actual) = 16 &&
        test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
 '