[PATCH v4 08/11] stash: do not attempt to remove startup_info->original_cwd
- From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Nov 29, 2021, 22:37 UTC
- Message-ID
- <a2be40a22d1cab518fd006c2646ba8ada29b8716.1638225434.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1140.v4.git.git.1638225434.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>
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.
Signed-off-by: Elijah Newren <newren@gmail.com> --- builtin/stash.c | 4 +++- t/t2501-cwd-empty.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/stash.c b/builtin/stash.c index a0ccc8654df..de0e432a4ff 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 4f7dba9ab3d..e2586a63eca 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 '
-- gitgitgadget