Sync with maint

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 77c5ed6a18e7849c4b823f9056dfb34cca951e15..26f82063267f3043f7f9c36745d913c12dbe0a27 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -467,8 +467,8 @@ test_expect_success MINGW 'redirect std handles' '
                GIT_REDIRECT_STDOUT=output.txt \
                GIT_REDIRECT_STDERR="2>&1" \
                git rev-parse --git-dir --verify refs/invalid &&
-       printf ".git\nfatal: Needed a single revision\n" >expect &&
-       test_cmp expect output.txt
+       grep "^\\.git\$" output.txt &&
+       grep "Needed a single revision" output.txt
 '
 
 test_done