Merge branch 'maint'

diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index c5dbc724b6da5ad3cc4bbac2925a76ba6a57363c..cb144258ccc3f32025c4b7beba6ac02c427612d8 100755 (executable)
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -32,7 +32,7 @@ test_expect_success 'bad setup: invalid .git file format' '
                echo "git rev-parse accepted an invalid .git file"
                false
        fi &&
-       if ! grep -qe "Invalid gitfile format" .err
+       if ! grep "Invalid gitfile format" .err
        then
                echo "git rev-parse returned wrong error"
                false
@@ -46,7 +46,7 @@ test_expect_success 'bad setup: invalid .git file path' '
                echo "git rev-parse accepted an invalid .git file path"
                false
        fi &&
-       if ! grep -qe "Not a git repository" .err
+       if ! grep "Not a git repository" .err
        then
                echo "git rev-parse returned wrong error"
                false
@@ -66,7 +66,7 @@ test_expect_success 'check hash-object' '
 
 test_expect_success 'check cat-file' '
        git cat-file blob $SHA >actual &&
-       diff -u bar actual
+       test_cmp bar actual
 '
 
 test_expect_success 'check update-index' '