diff options
| author | Elijah Newren <newren@gmail.com> | 2021-12-09 05:08:32 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-09 13:33:13 -0800 |
| commit | 0fce211cccd0dce848d217cd4e2037214d7be1dd (patch) | |
| tree | 20b5405c6a8694250cb284056987b1856479ba77 | |
| parent | rebase: do not attempt to remove startup_info->original_cwd (diff) | |
| download | git-0fce211cccd0dce848d217cd4e2037214d7be1dd.tar.gz git-0fce211cccd0dce848d217cd4e2037214d7be1dd.zip | |
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>
| -rw-r--r-- | builtin/stash.c | 4 | ||||
| -rwxr-xr-x | t/t2501-cwd-empty.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index a0ccc8654d..de0e432a4f 100644 --- 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 52335a8afe..be9ef903bd 100755 --- 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 ' |