Skip to content

Commit

Permalink
worktree: add: make -b/-B default to HEAD when <branch> is omitted
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
sunshineco authored and gitster committed Jul 6, 2015
1 parent f5682b2 commit 0f4af3b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions Documentation/git-worktree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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>`.
Expand Down
6 changes: 4 additions & 2 deletions builtin/worktree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions t/t2025-worktree-add.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 0f4af3b

Please sign in to comment.