Merge branch 'en/keep-cwd'

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 6abd72160ccd46791d5a262021804e07ab9ea37f..5213d16e97174adbf10fc487edb0f3d3a726f7d7 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -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);