aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-25 15:32:22 -0700
committerJunio C Hamano <gitster@pobox.com>2007-07-25 15:34:52 -0700
commitceff079bdcaebb67b0379a1036a32b4dfebb6012 (patch)
tree670da24ef878391367b2d350a20f9ab42593eb5d /t
parent4eb994733d75d40cab87e7b4736166cf33e7787a (diff)
downloadgit-ceff079bdcaebb67b0379a1036a32b4dfebb6012.tar.gz
git-ceff079bdcaebb67b0379a1036a32b4dfebb6012.tar.xz
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>
Diffstat (limited to 't')
-rwxr-xr-xt/t3903-stash.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 392ac1c5c..9a9a250d2 100755
--- 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