Merge branch 'vd/doc-unpack-objects' into maint

diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index f01edffa3c0babf76593fbd211f6606ff2036c74..1309702ba4f4c5a035bb3c6f8ded036e83c1d09d 100755 (executable)
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -122,8 +122,7 @@ test_remote_error()
        fi
 
        test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output &&
-       echo "fatal: remote error: $msg: /$repo" >expect &&
-       test_cmp expect output
+       test_i18ngrep "fatal: remote error: $msg: /$repo" output &&
        ret=$?
        chmod +x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git"
        (exit $ret)