diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2015-07-06 13:30:58 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-07-06 11:07:48 -0700 |
| commit | 0f4af3b9ea1fc62e445271bb2e7fbb8e1ac230b7 (patch) | |
| tree | 0980a1eeee8eababf711fc6b2e1dc0133bc0adac | |
| parent | worktree: extract basename computation to new function (diff) | |
| download | tgif-0f4af3b9ea1fc62e445271bb2e7fbb8e1ac230b7.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-worktree.txt | 1 | ||||
| -rw-r--r-- | builtin/worktree.c | 6 | ||||
| -rwxr-xr-x | t/t2025-worktree-add.sh | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index f44cd78784..377ae0f92e 100644 --- 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 25fe25b45f..323d444b35 100644 --- 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 192c936735..8964dec75a 100755 --- 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 |