Merge branch 'maint'

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 81b2570a3e21df5b35750df6539103e14425a31a..1fa2a5fc23da25643552cdf43408cb75480194ff 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -497,4 +497,12 @@ test_expect_success 'disambiguation (4)' '
        test ! -f secondfile
 '
 
+test_expect_success 'reset with paths accepts tree' '
+       # for simpler tests, drop last commit containing added files
+       git reset --hard HEAD^ &&
+       git reset HEAD^^{tree} -- . &&
+       git diff --cached HEAD^ --exit-code &&
+       git diff HEAD --exit-code
+'
+
 test_done