diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-07 03:46:36 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-07 03:46:36 +0400 |
| commit | 347c47e61e5daf1efb3503724a431e4316c6eb5b (patch) | |
| tree | f5c0c4da1c77b79cfa2831cfa2a55956d7be7528 /t/t3903-stash.sh | |
| parent | c2e0940b44ded03f0af02be95c35b231fea633c1 (diff) | |
| parent | fd4ec4f2bb980ce07bb28d5823a95610f251d00b (diff) | |
Merge branch 'jl/maint-fix-test'
* jl/maint-fix-test:
Several tests: cd inside subshell instead of around
Conflicts:
t/t9600-cvsimport.sh
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index d99f27a12f..056bc2b248 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -69,9 +69,9 @@ test_expect_success 'apply stashed changes (including index)' ' test_expect_success 'unstashing in a subdirectory' ' git reset --hard HEAD && mkdir subdir && - cd subdir && - git stash apply && - cd .. + (cd subdir && + git stash apply + ) ' test_expect_success 'drop top stash' ' |