reset: optionally setup worktree and refresh index on --mixed

diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index f01edffa3c0babf76593fbd211f6606ff2036c74..e06146835cdda5b7264a34a24405aedd9f950006 100755 (executable)
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -37,7 +37,7 @@ test_expect_success 'fetch changes via git protocol' '
        test_cmp file clone/file
 '
 
-test_expect_failure 'remote detects correct HEAD' '
+test_expect_success 'remote detects correct HEAD' '
        git push public master:other &&
        (cd clone &&
         git remote set-head -d origin &&
@@ -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)