worktree: add: make -b/-B default to HEAD when <branch> is omitted

As a convenience, like "git branch" and "git checkout -b", make
"git worktree add -b <newbranch> <path> <branch>" default to HEAD when
<branch> is omitted.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index f44cd78784b9e23e861a7b342a9cfa5cbf6033c4..377ae0f92e2c0009d6a2f33fb85bfa19667dcd89 100644 (file)
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -68,6 +68,7 @@ OPTIONS
 -B <new-branch>::
        With `add`, create a new branch named `<new-branch>` starting at
        `<branch>`, and check out `<new-branch>` into the new worktree.
+       If `<branch>` is omitted, it defaults to HEAD.
        By default, `-b` refuses to create a new branch if it already
        exists. `-B` overrides this safeguard, resetting `<new-branch>` to
        `<branch>`.

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 25fe25b45f7771bb3b000ae92aa5f24875adc51e..323d444b35cd465f5c7c61d4d935475c562be0d3 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -289,11 +289,13 @@ static int add(int ac, const char **av, const char *prefix)
        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 (ac < 1 || ac > 2)
+               usage_with_options(worktree_usage, options);
+       if (ac < 2 && !new_branch && !new_branch_force)
                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];
 
        argv_array_push(&cmd, "checkout");
        if (force)

diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index 192c936735283aa94bf33f8bf1b09eb772bc33f7..8964dec75ab808a440c40de8e320f20f12fb7908 100755 (executable)
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -140,4 +140,9 @@ test_expect_success '"add" from relative HEAD' '
        test_cmp expected actual
 '
 
+test_expect_success '"add -b" with <branch> omitted' '
+       git worktree add -b burble flornk &&
+       test_cmp_rev HEAD burble
+'
+
 test_done