mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/keep-cwd' into maint

Browse Source 
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:
Junio C Hamano
2022-01-28 16:45:39 -08:00
parent 89bece5c8c ff5b7913f0
commit f120b65cd4
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sequencer.c
View File

@ -4223,8 +4223,11 @@ static int run_git_checkout(struct repository *r, struct replay_opts *opts,
cmd.git_cmd = 1;
if (startup_info->original_cwd)
if (startup_info->original_cwd) {
cmd.dir = startup_info->original_cwd;
strvec_pushf(&cmd.env_array, "%s=%s",
GIT_WORK_TREE_ENVIRONMENT, r->worktree);
}
strvec_push(&cmd.args, "checkout");
strvec_push(&cmd.args, commit);
strvec_pushf(&cmd.env_array, GIT_REFLOG_ACTION "=%s", action);