summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2015-07-06 17:30:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-07 21:34:32 (GMT)
commit1eb07d829f3f0992c93c6b44fdcc4e95ebab12f3 (patch)
tree300efa4a8e232730a677a9337d591d12388eebaa /builtin
parent0f4af3b9ea1fc62e445271bb2e7fbb8e1ac230b7 (diff)
downloadgit-1eb07d829f3f0992c93c6b44fdcc4e95ebab12f3.zip
git-1eb07d829f3f0992c93c6b44fdcc4e95ebab12f3.tar.gz
git-1eb07d829f3f0992c93c6b44fdcc4e95ebab12f3.tar.bz2
worktree: add: auto-vivify new branch when <branch> is omitted
As a convenience, when <branch> is omitted from "git worktree <path> <branch>" and neither -b nor -B is used, automatically create a new branch named after <path>, as if "-b $(basename <path>)" was specified. Thus, "git worktree add ../hotfix" creates a new branch named "hotfix" and associates it with new worktree "../hotfix". Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/worktree.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 323d444..69248ba 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -291,12 +291,16 @@ static int add(int ac, const char **av, const char *prefix)
die(_("-b and -B are mutually exclusive"));
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 = ac < 2 ? "HEAD" : av[1];
+ if (ac < 2 && !new_branch && !new_branch_force) {
+ int n;
+ const char *s = worktree_basename(path, &n);
+ new_branch = xstrndup(s, n);
+ }
+
argv_array_push(&cmd, "checkout");
if (force)
argv_array_push(&cmd, "--ignore-other-worktrees");