Merge branch 'ak/gitweb-fit-image'

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index bc0846f4356e548cc72d3cf0c18ef00c21ede87d..450529404c686469ed5ba5ad465cf8b3ef651ef9 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -550,4 +550,15 @@ test_expect_success 'reset -N keeps removed files as intent-to-add' '
        test_cmp expect actual
 '
 
+test_expect_success 'reset --mixed sets up work tree' '
+       git init mixed_worktree &&
+       (
+               cd mixed_worktree &&
+               test_commit dummy
+       ) &&
+       : >expect &&
+       git --git-dir=mixed_worktree/.git --work-tree=mixed_worktree reset >actual &&
+       test_cmp expect actual
+'
+
 test_done