diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-23 21:55:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-23 21:55:37 (GMT) |
| commit | 6fe519a91cc7131931ca50fedcdeb8e41453c892 (patch) | |
| tree | 42cc1a15b0bdb535713a2296192b9f9eaf0b4d63 /git-stash.sh | |
| parent | 7d0cf357a31cc8a442342696788d776265482ce9 (diff) | |
| parent | 6eaf92f3d08180da4a6bd40035919a7e07ffed5a (diff) | |
| download | git-6fe519a91cc7131931ca50fedcdeb8e41453c892.zip git-6fe519a91cc7131931ca50fedcdeb8e41453c892.tar.gz git-6fe519a91cc7131931ca50fedcdeb8e41453c892.tar.bz2 | |
Merge branch 'pk/stash-apply-status-relative'
* pk/stash-apply-status-relative:
Add test: git stash shows status relative to current dir
git stash: show status relative to current directory
Diffstat (limited to 'git-stash.sh')
| -rwxr-xr-x | git-stash.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh index 5130228..a305fb1 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -12,6 +12,7 @@ USAGE="list [<options>] SUBDIRECTORY_OK=Yes OPTIONS_SPEC= +START_DIR=`pwd` . git-sh-setup require_work_tree cd_to_toplevel @@ -393,7 +394,7 @@ apply_stash () { then squelch='>/dev/null 2>&1' fi - eval "git status $squelch" || : + (cd "$START_DIR" && eval "git status $squelch") || : else # Merge conflict; keep the exit status from merge-recursive status=$? |