git-stash: fix pushing stash with pathspec from subdir

The `git stash push` command recently gained the ability to get a
pathspec as its argument to only stash matching files. Calling this
command from a subdirectory does not work, though, as one of the first
things we do is changing to the top level directory without keeping
track of the prefix from which the command is being run.

Fix the shortcoming by storing the prefix previous to the call to
`cd_to_toplevel` and then subsequently using `git rev-parse --prefix` to
correctly resolve the pathspec. Add a test to catch future breakage of
this usecase.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-stash.sh b/git-stash.sh
index 2fb651b2b8d9d91a130b1cbd11c3c2b6b1cf961b..e7b85932d6ba62ec9f581c692a321ac24e52dcac 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -19,6 +19,7 @@ OPTIONS_SPEC=
 START_DIR=$(pwd)
 . git-sh-setup
 require_work_tree
 START_DIR=$(pwd)
 . git-sh-setup
 require_work_tree

+prefix=$(git rev-parse --show-prefix) || exit 1

 cd_to_toplevel
 
 TMP="$GIT_DIR/.git-stash.$$"
 cd_to_toplevel
 
 TMP="$GIT_DIR/.git-stash.$$"


@@ -273,6 +274,8 @@ push_stash () {
                shift
        done
 
                shift
        done
 

+       eval "set $(git rev-parse --sq --prefix "$prefix" -- "$@")"
+

        if test -n "$patch_mode" && test -n "$untracked"
        then
                die "$(gettext "Can't use --patch and --include-untracked or --all at the same time")"
        if test -n "$patch_mode" && test -n "$untracked"
        then
                die "$(gettext "Can't use --patch and --include-untracked or --all at the same time")"

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index b71d1e659e97c0f34bc5bcfeda65b854c2d714e9..d10ddb5b3580f02eab6f9e7694c186b0c3025e42 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -812,6 +812,22 @@ test_expect_success 'stash -- <pathspec> stashes and restores the file' '
        test_path_is_file bar
 '
 
        test_path_is_file bar
 '
 

+test_expect_success 'stash -- <pathspec> stashes in subdirectory' '
+       mkdir sub &&
+       >foo &&
+       >bar &&
+       git add foo bar &&
+       (
+               cd sub &&
+               git stash push -- ../foo
+       ) &&
+       test_path_is_file bar &&
+       test_path_is_missing foo &&
+       git stash pop &&
+       test_path_is_file foo &&
+       test_path_is_file bar
+'
+

 test_expect_success 'stash with multiple pathspec arguments' '
        >foo &&
        >bar &&
 test_expect_success 'stash with multiple pathspec arguments' '
        >foo &&
        >bar &&