git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 15/20] worktree: add_worktree: construct worktree-population command locally

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jul 16, 2015, 08:20 UTC
Message-ID
<1437034825-32054-16-git-send-email-sunshine@sunshineco.com>
In-Reply-To
<1437034825-32054-1-git-send-email-sunshine@sunshineco.com>

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 convoluted.

Moreover, the eventual goal is for git-worktree to make setting of HEAD and worktree population distinct operations, whereas they are currently conflated into a single git-checkout invocation. As such, add_worktree() will eventually 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 <sunshine@sunshineco.com>
---
Changes since v1: reword commit message.
 builtin/worktree.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 7ae186f..28095c1 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;
@@ -261,7 +261,12 @@ static int add_worktree(const char *path, const char **child_argv,
 	argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
 	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);
 	cp.env = child_env.argv;
 	ret = run_command(&cp);
 	if (!ret) {
@@ -286,7 +291,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"),
@@ -331,14 +335,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.rc2.378.g0af52e8
Previous: Eric SunshineNext: Eric Sunshine
Message 19 of 25 in “rid git-checkout of too-intimate knowledge of new worktree”
  1. 00/20 rid git-checkout of too-intimate knowledge of new worktreeEric Sunshine, Jul 16, 2015
  2. 01/20 checkout: avoid resolving HEAD unnecessarilyEric Sunshine, Jul 16, 2015
  3. 02/20 checkout: name check_linked_checkouts() more meaningfullyEric Sunshine, Jul 16, 2015
  4. 03/20 checkout: improve die_if_checked_out() robustnessEric Sunshine, Jul 16, 2015
  5. 04/20 checkout: die_if_checked_out: simplify strbuf managementEric Sunshine, Jul 16, 2015
  6. 05/20 checkout: generalize die_if_checked_out() branch name argumentEric Sunshine, Jul 16, 2015
  7. 06/20 checkout: check_linked_checkout: improve "already checked out" aestheticEric Sunshine, Jul 16, 2015
  8. Junio C HamanoJul 16, 2015
  9. Eric SunshineJul 17, 2015
  10. Duy NguyenJul 17, 2015
  11. 07/20 checkout: check_linked_checkout: simplify symref parsingEric Sunshine, Jul 16, 2015
  12. 08/20 checkout: teach check_linked_checkout() about symbolic link HEADEric Sunshine, Jul 16, 2015
  13. 09/20 branch: publish die_if_checked_out()Eric Sunshine, Jul 16, 2015
  14. 10/20 worktree: simplify new branch (-b/-B) option checkingEric Sunshine, Jul 16, 2015
  15. 11/20 worktree: introduce options containerEric Sunshine, Jul 16, 2015
  16. 12/20 worktree: make --detach mutually exclusive with -b/-BEric Sunshine, Jul 16, 2015
  17. 13/20 worktree: make branch creation distinct from worktree populationEric Sunshine, Jul 16, 2015
  18. 14/20 worktree: elucidate environment variables intended for child processesEric Sunshine, Jul 16, 2015
  19. 15/20 worktree: add_worktree: construct worktree-population command locallyEric Sunshine, Jul 16, 2015
  20. 16/20 worktree: detect branch-name/detached and error conditions locallyEric Sunshine, Jul 16, 2015
  21. 17/20 worktree: make setup of new HEAD distinct from worktree populationEric Sunshine, Jul 16, 2015
  22. 18/20 worktree: avoid resolving HEAD unnecessarilyEric Sunshine, Jul 16, 2015
  23. 19/20 worktree: populate via "git reset --hard" rather than "git checkout"Eric Sunshine, Jul 16, 2015
  24. 20/20 checkout: drop intimate knowledge of newly created worktreeEric Sunshine, Jul 16, 2015
  25. Junio C HamanoJul 16, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.