The caller of add_worktree() provides it with a command to invoke to populate the new worktree. This was a useful abstraction during the conversion of "git checkout --to" functionality to "git worktree add" since git-checkout and git-worktree constructed the population command differently. However, now that "git checkout --to" has been retired, and add_worktree() has access to the options given to "worktree add", this extra indirection is no longer useful, and makes the code a bit more convoluted than it needs to be.
Moreover, the eventual goal is for git-worktree to populate the new worktree via "git reset --hard" rather than "git checkout", and to do so, it may need to invoke other commands in addition to the worktree-population command, so it will be doing command construction itself anyhow. Therefore, relocate construction of the worktree-population command from add() to add_worktree(). Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com> --- builtin/worktree.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 9be1c74..e04a6d1 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -178,7 +178,7 @@ static const char *worktree_basename(const char *path, int *olen) return name; } -static int add_worktree(const char *path, const char **child_argv, +static int add_worktree(const char *path, const char *refname, const struct add_opts *opts) { struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT; @@ -260,7 +260,12 @@ static int add_worktree(const char *path, const char **child_argv, setenv(GIT_WORK_TREE_ENVIRONMENT, path, 1); memset(&cp, 0, sizeof(cp)); cp.git_cmd = 1; - cp.argv = child_argv; + argv_array_push(&cp.args, "checkout"); + if (opts->force) + argv_array_push(&cp.args, "--ignore-other-worktrees"); + if (opts->detach) + argv_array_push(&cp.args, "--detach"); + argv_array_push(&cp.args, refname); ret = run_command(&cp); if (!ret) { is_junk = 0; @@ -283,7 +288,6 @@ static int add(int ac, const char **av, const char *prefix) struct add_opts opts; const char *new_branch_force = NULL; const char *path, *branch; - struct argv_array cmd = ARGV_ARRAY_INIT; struct option options[] = { OPT__FORCE(&opts.force, N_("checkout <branch> even if already checked out in other worktree")), OPT_STRING('b', NULL, &opts.new_branch, N_("branch"), @@ -328,14 +332,7 @@ static int add(int ac, const char **av, const char *prefix) branch = opts.new_branch; } - argv_array_push(&cmd, "checkout"); - if (opts.force) - argv_array_push(&cmd, "--ignore-other-worktrees"); - if (opts.detach) - argv_array_push(&cmd, "--detach"); - argv_array_push(&cmd, branch); - - return add_worktree(path, cmd.argv, &opts); + return add_worktree(path, branch, &opts); } int cmd_worktree(int ac, const char **av, const char *prefix) -- 2.5.0.rc1.201.ga12d9f8 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html