Merge branch 'mk/maint-parse-careful'

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 392ac1c5c5ff9edfe9bd96abb302376387f42ce8..9a9a250d2c6bad80745b7ebd2df7ac947d30b521 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -66,4 +66,11 @@ test_expect_success 'apply stashed changes (including index)' '
        test 1 = $(git show HEAD:file)
 '
 
+test_expect_success 'unstashing in a subdirectory' '
+       git reset --hard HEAD &&
+       mkdir subdir &&
+       cd subdir &&
+       git stash apply
+'
+
 test_done