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>
Elijah Newren committed
Dec 9, 2021 at 05:08 UTC
0fce211cccd0dce848d217cd4e2037214d7be1dd
2 files changed
+4
-2
builtin/stash.c
+3
-1
@@ -1485,8 +1485,10 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
1485
struct child_process cp = CHILD_PROCESS_INIT;
1486
1487
cp.git_cmd = 1;
1488
+ if (startup_info->original_cwd)
1489
+ cp.dir = startup_info->original_cwd;
1490
strvec_pushl(&cp.args, "clean", "--force",
1489
- "--quiet", "-d", NULL);
1491
+ "--quiet", "-d", ":/", NULL);
1492
if (include_untracked == INCLUDE_ALL_FILES)
1493
strvec_push(&cp.args, "-x");
1494
if (run_command(&cp)) {
t/t2501-cwd-empty.sh
+1
-1
@@ -236,7 +236,7 @@ test_expect_success 'clean does not remove cwd incidentally' '
236
'
237
238
test_expect_success 'stash does not remove cwd incidentally' '
239
- test_incidental_untracked_dir_removal failure \
239
+ test_incidental_untracked_dir_removal success \
240
git stash --include-untracked
241
'
242