@matheusbsbs / matheus-bagliano / commits / 7f44e3d1de

worktree: make setup of new HEAD distinct from worktree population

git-worktree currently conflates setting of HEAD in the new worktree and initial worktree population into a single git-checkout invocation which requires git-checkout to have special knowledge that it is operating on a newly created worktree. The eventual goal is to rid git-checkout of that overly-intimate knowledge. Once these operations are separate, git-worktree will no longer be able to delegate to git-branch the setting of the new worktree's HEAD to the desired branch (or commit, if detached). Therefore, make git-worktree itself responsible for setting up HEAD as either a symbolic reference, if associated with a branch, or detached, if not. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Eric Sunshine committed Jul 17, 2015 at 19:00 UTC 7f44e3d1de08bf99c8dbd69d6437b712df369692
1 file changed +15 -5
builtin/worktree.c
+15 -5
@@ -278,12 +278,21 @@ static int add_worktree(const char *path, const char *refname,
278 argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
279 memset(&cp, 0, sizeof(cp));
280 cp.git_cmd = 1;
281 +
282 + if (commit)
283 + argv_array_pushl(&cp.args, "update-ref", "HEAD",
284 + sha1_to_hex(commit->object.sha1), NULL);
285 + else
286 + argv_array_pushl(&cp.args, "symbolic-ref", "HEAD",
287 + symref.buf, NULL);
288 + cp.env = child_env.argv;
289 + ret = run_command(&cp);
290 + if (ret)
291 + goto done;
292 +
293 + cp.argv = NULL;
294 + argv_array_clear(&cp.args);
295 argv_array_push(&cp.args, "checkout");
282 - if (opts->force)
283 - argv_array_push(&cp.args, "--ignore-other-worktrees");
284 - if (opts->detach)
285 - argv_array_push(&cp.args, "--detach");
286 - argv_array_push(&cp.args, refname);
296 cp.env = child_env.argv;
297 ret = run_command(&cp);
298 if (!ret) {
@@ -293,6 +302,7 @@ static int add_worktree(const char *path, const char *refname,
302 junk_work_tree = NULL;
303 junk_git_dir = NULL;
304 }
305 +done:
306 strbuf_reset(&sb);
307 strbuf_addf(&sb, "%s/locked", sb_repo.buf);
308 unlink_or_warn(sb.buf);