worktree: simplify new branch (-b/-B) option checking
Make 'new_branch' be the name of the new branch for both forced and non-forced cases; and add boolean 'force_new_branch' to indicate forced branch creation. This will simplify logic later on when git-worktree handles branch creation locally rather than delegating it to git-checkout as part of the worktree population phase. 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
eef005dcb3e039ccc3da65e9347cf4357bdeea6a
1 file changed
+8
-5
builtin/worktree.c
+8
-5
@@ -272,7 +272,7 @@ static int add_worktree(const char *path, const char **child_argv)
272
273
static int add(int ac, const char **av, const char *prefix)
274
{
275
- int force = 0, detach = 0;
275
+ int force = 0, detach = 0, force_new_branch;
276
const char *new_branch = NULL, *new_branch_force = NULL;
277
const char *path, *branch;
278
struct argv_array cmd = ARGV_ARRAY_INIT;
@@ -295,7 +295,11 @@ static int add(int ac, const char **av, const char *prefix)
295
path = prefix ? prefix_filename(prefix, strlen(prefix), av[0]) : av[0];
296
branch = ac < 2 ? "HEAD" : av[1];
297
298
- if (ac < 2 && !new_branch && !new_branch_force) {
298
+ force_new_branch = !!new_branch_force;
299
+ if (force_new_branch)
300
+ new_branch = new_branch_force;
301
+
302
+ if (ac < 2 && !new_branch) {
303
int n;
304
const char *s = worktree_basename(path, &n);
305
new_branch = xstrndup(s, n);
@@ -305,9 +309,8 @@ static int add(int ac, const char **av, const char *prefix)
309
if (force)
310
argv_array_push(&cmd, "--ignore-other-worktrees");
311
if (new_branch)
308
- argv_array_pushl(&cmd, "-b", new_branch, NULL);
309
- if (new_branch_force)
310
- argv_array_pushl(&cmd, "-B", new_branch_force, NULL);
312
+ argv_array_pushl(&cmd, force_new_branch ? "-B" : "-b",
313
+ new_branch, NULL);
314
if (detach)
315
argv_array_push(&cmd, "--detach");
316
argv_array_push(&cmd, branch);