aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-01 16:23:43 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-01 16:23:43 -0700
commit2aa5b6b6c0b2a2791dc9953371f2dca030b01a4d (patch)
tree7d4aaf0b0b04a5efd39b34206e0ac448c31095e1
parentbcf3d1fd9ccc04350d793c077d3c112fb26f43f0 (diff)
parent6eaf92f3d08180da4a6bd40035919a7e07ffed5a (diff)
downloadgit-2aa5b6b6c0b2a2791dc9953371f2dca030b01a4d.tar.gz
git-2aa5b6b6c0b2a2791dc9953371f2dca030b01a4d.tar.xz
Merge branch 'pk/stash-apply-status-relative' into maint
* pk/stash-apply-status-relative: Add test: git stash shows status relative to current dir git stash: show status relative to current directory
-rwxr-xr-xgit-stash.sh3
-rwxr-xr-xt/t3903-stash.sh19
2 files changed, 21 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 513022890..a305fb19f 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=$?
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 6fd560ccf..f62aaf581 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -556,4 +556,23 @@ test_expect_success 'stash branch should not drop the stash if the branch exists
git rev-parse stash@{0} --
'
+test_expect_success 'stash apply shows status same as git status (relative to current directory)' '
+ git stash clear &&
+ echo 1 >subdir/subfile1 &&
+ echo 2 >subdir/subfile2 &&
+ git add subdir/subfile1 &&
+ git commit -m subdir &&
+ (
+ cd subdir &&
+ echo x >subfile1 &&
+ echo x >../file &&
+ git status >../expect &&
+ git stash &&
+ sane_unset GIT_MERGE_VERBOSITY &&
+ git stash apply
+ ) |
+ sed -e 1,2d >actual && # drop "Saved..." and "HEAD is now..."
+ test_cmp expect actual
+'
+
test_done