Merge branch 'en/keep-cwd' into maint
Fix a regression in 2.35 that roke the use of "rebase" and "stash" in a secondary worktree. * en/keep-cwd: sequencer, stash: fix running from worktree subdir
This commit is contained in:
@ -1539,8 +1539,12 @@ 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)
|
||||
if (startup_info->original_cwd) {
|
||||
cp.dir = startup_info->original_cwd;
|
||||
strvec_pushf(&cp.env_array, "%s=%s",
|
||||
GIT_WORK_TREE_ENVIRONMENT,
|
||||
the_repository->worktree);
|
||||
}
|
||||
strvec_pushl(&cp.args, "clean", "--force",
|
||||
"--quiet", "-d", ":/", NULL);
|
||||
if (include_untracked == INCLUDE_ALL_FILES)
|
||||
|
Reference in New Issue
Block a user