Make sure git-stash works from subdirectory.

We say "SUBDIRECTORY_OK" but we did not chdir to toplevel; this
is fine as long as everything we use can be started from a
subdirectory, but unfortunately "merge-recursive" is not one of
the programs you can safely use from a subdirectory.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-stash.sh b/git-stash.sh
index de13dd1812170ca76eb5706aefb7f59d22be6d48..d9cd42d4b34d7ea938131deba305ae9ef636ec7b 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -6,6 +6,7 @@ USAGE='[ | list | show | apply | clear]'
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
 require_work_tree
+cd_to_toplevel
 
 TMP="$GIT_DIR/.git-stash.$$"
 trap 'rm -f "$TMP-*"' 0

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