From 0f4af3b9ea1fc62e445271bb2e7fbb8e1ac230b7 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Mon, 6 Jul 2015 13:30:58 -0400 Subject: worktree: add: make -b/-B default to HEAD when is omitted As a convenience, like "git branch" and "git checkout -b", make "git worktree add -b " default to HEAD when is omitted. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- builtin/worktree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'builtin/worktree.c') 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) -- cgit v1.2.1