worktree: make branch creation distinct from worktree population

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 04e6d0f92798f32dd10c1e677f3d85760f7dcdc6..8225468f1171f5f1f3805698d3e072c1d454e417 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -12,6 +12,13 @@ static const char * const worktree_usage[] = {
        NULL
 };
 
+struct add_opts {
+       int force;
+       int detach;
+       const char *new_branch;
+       int force_new_branch;
+};
+
 static int show_only;
 static int verbose;
 static unsigned long expire;
@@ -152,18 +159,10 @@ static void remove_junk_on_signal(int signo)
        raise(signo);
 }
 
-static int add_worktree(const char *path, const char **child_argv)
+static const char *worktree_basename(const char *path, int *olen)
 {
-       struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
-       struct strbuf sb = STRBUF_INIT;
        const char *name;
-       struct stat st;
-       struct child_process cp;
-       int counter = 0, len, ret;
-       unsigned char rev[20];
-
-       if (file_exists(path) && !is_empty_dir(path))
-               die(_("'%s' already exists"), path);
+       int len;
 
        len = strlen(path);
        while (len && is_dir_sep(path[len - 1]))
@@ -174,6 +173,26 @@ static int add_worktree(const char *path, const char **child_argv)
                        name++;
                        break;
                }
+
+       *olen = len;
+       return name;
+}
+
+static int add_worktree(const char *path, const char **child_argv,
+                       const struct add_opts *opts)
+{
+       struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
+       struct strbuf sb = STRBUF_INIT;
+       const char *name;
+       struct stat st;
+       struct child_process cp;
+       int counter = 0, len, ret;
+       unsigned char rev[20];
+
+       if (file_exists(path) && !is_empty_dir(path))
+               die(_("'%s' already exists"), path);
+
+       name = worktree_basename(path, &len);
        strbuf_addstr(&sb_repo,
                      git_path("worktrees/%.*s", (int)(path + len - name), name));
        len = sb_repo.len;
@@ -234,7 +253,7 @@ static int add_worktree(const char *path, const char **child_argv)
        strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
        write_file(sb.buf, 1, "../..\n");
 
-       fprintf_ln(stderr, _("Enter %s (identifier %s)"), path, name);
+       fprintf_ln(stderr, _("Preparing %s (identifier %s)"), path, name);
 
        setenv("GIT_CHECKOUT_NEW_WORKTREE", "1", 1);
        setenv(GIT_DIR_ENVIRONMENT, sb_git.buf, 1);
@@ -261,41 +280,62 @@ static int add_worktree(const char *path, const char **child_argv)
 
 static int add(int ac, const char **av, const char *prefix)
 {
-       int force = 0, detach = 0;
-       const char *new_branch = NULL, *new_branch_force = NULL;
+       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(&force, N_("checkout <branch> even if already checked out in other worktree")),
-               OPT_STRING('b', NULL, &new_branch, N_("branch"),
+               OPT__FORCE(&opts.force, N_("checkout <branch> even if already checked out in other worktree")),
+               OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
                           N_("create a new branch")),
                OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
                           N_("create or reset a branch")),
-               OPT_BOOL(0, "detach", &detach, N_("detach HEAD at named commit")),
+               OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
                OPT_END()
        };
 
+       memset(&opts, 0, sizeof(opts));
        ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
-       if (new_branch && new_branch_force)
-               die(_("-b and -B are mutually exclusive"));
-       if (ac != 2)
+       if (!!opts.detach + !!opts.new_branch + !!new_branch_force > 1)
+               die(_("-b, -B, and --detach are mutually exclusive"));
+       if (ac < 1 || ac > 2)
                usage_with_options(worktree_usage, options);
 
        path = prefix ? prefix_filename(prefix, strlen(prefix), av[0]) : av[0];
-       branch = av[1];
+       branch = ac < 2 ? "HEAD" : av[1];
+
+       opts.force_new_branch = !!new_branch_force;
+       if (opts.force_new_branch)
+               opts.new_branch = new_branch_force;
+
+       if (ac < 2 && !opts.new_branch && !opts.detach) {
+               int n;
+               const char *s = worktree_basename(path, &n);
+               opts.new_branch = xstrndup(s, n);
+       }
+
+       if (opts.new_branch) {
+               struct child_process cp;
+               memset(&cp, 0, sizeof(cp));
+               cp.git_cmd = 1;
+               argv_array_push(&cp.args, "branch");
+               if (opts.force_new_branch)
+                       argv_array_push(&cp.args, "--force");
+               argv_array_push(&cp.args, opts.new_branch);
+               argv_array_push(&cp.args, branch);
+               if (run_command(&cp))
+                       return -1;
+               branch = opts.new_branch;
+       }
 
        argv_array_push(&cmd, "checkout");
-       if (force)
+       if (opts.force)
                argv_array_push(&cmd, "--ignore-other-worktrees");
-       if (new_branch)
-               argv_array_pushl(&cmd, "-b", new_branch, NULL);
-       if (new_branch_force)
-               argv_array_pushl(&cmd, "-B", new_branch_force, NULL);
-       if (detach)
+       if (opts.detach)
                argv_array_push(&cmd, "--detach");
        argv_array_push(&cmd, branch);
 
-       return add_worktree(path, cmd.argv);
+       return add_worktree(path, cmd.argv, &opts);
 }
 
 int cmd_worktree(int ac, const char **av, const char *prefix)