undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Eric Sunshine 2015-07-06 13:30:58 -04:00 committed by Junio C Hamano
parent f5682b2a86
commit 0f4af3b9ea
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/git-worktree.txt
View File

@ -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>`.

6
builtin/worktree.c
View File

@ -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)

5
t/t2025-worktree-add.sh
View File

@ -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