Merge branch 'maint-1.5.4' into maint

diff --git a/t/t7502-status.sh b/t/t7502-status.sh
index e00607490bcb0439c6557003a3419d84823a8f00..cd08516e6de6b5c4b39ffee14302d76c99229825 100755 (executable)
--- a/t/t7502-status.sh
+++ b/t/t7502-status.sh
@@ -33,7 +33,7 @@ test_expect_success 'setup' '
 
 test_expect_success 'status (1)' '
 
-       grep -e "use \"git rm --cached <file>\.\.\.\" to unstage" output
+       grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
 
 '
 
@@ -146,7 +146,7 @@ cat <<EOF >expect
 EOF
 test_expect_success 'status of partial commit excluding new file in index' '
        git status dir1/modified >output &&
-       diff -u expect output
+       test_cmp expect output
 '
 
 test_done