stash: do not attempt to remove startup_info->original_cwd

Since stash spawns a `clean` subprocess, make sure we run that from the
startup_info->original_cwd directory, so that the `clean` processs knows
to protect that directory.  Also, since the `clean` command might no
longer run from the toplevel, pass the ':/' magic pathspec to ensure we
still clean from the toplevel.

Acked-by: Derrick Stolee <stolee@gmail.com>
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/stash.c b/builtin/stash.c
index a0ccc8654dff70bd3014dca9d804a75bdd4c3cbc..de0e432a4ff901ce48508d879d35dc9d4238b457 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -1485,8 +1485,10 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
                        struct child_process cp = CHILD_PROCESS_INIT;
 
                        cp.git_cmd = 1;
+                       if (startup_info->original_cwd)
+                               cp.dir = startup_info->original_cwd;
                        strvec_pushl(&cp.args, "clean", "--force",
-                                    "--quiet", "-d", NULL);
+                                    "--quiet", "-d", ":/", NULL);
                        if (include_untracked == INCLUDE_ALL_FILES)
                                strvec_push(&cp.args, "-x");
                        if (run_command(&cp)) {

diff --git a/t/t2501-cwd-empty.sh b/t/t2501-cwd-empty.sh
index 52335a8afe9cee06f50cb6d5c58a978fe076dc5d..be9ef903bd4de6e1b0feddd8bbb0d4e71dfbe0c8 100755 (executable)
--- a/t/t2501-cwd-empty.sh
+++ b/t/t2501-cwd-empty.sh
@@ -236,7 +236,7 @@ test_expect_success 'clean does not remove cwd incidentally' '
 '
 
 test_expect_success 'stash does not remove cwd incidentally' '
-       test_incidental_untracked_dir_removal failure \
+       test_incidental_untracked_dir_removal success \
                git stash --include-untracked
 '