diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2015-07-17 19:00:09 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-07-20 11:29:51 -0700 |
| commit | 5c942570fe2a48d8fde348e89392c2e9e23aa483 (patch) | |
| tree | 1be8561173a8f4d7f33066ee3158f1549b8b968e /builtin | |
| parent | worktree: make --detach mutually exclusive with -b/-B (diff) | |
| download | tgif-5c942570fe2a48d8fde348e89392c2e9e23aa483.tar.xz | |
worktree: add: suppress auto-vivication with --detach and no <branch>
Fix oversight where branch auto-vivication incorrectly kicks in when
--detach is specified and <branch> omitted. Instead, treat:
git worktree add --detach <path>
as shorthand for:
git worktree add --detach <path> HEAD
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index 813e016130..83484ad502 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -308,7 +308,7 @@ static int add(int ac, const char **av, const char *prefix) if (opts.force_new_branch) opts.new_branch = new_branch_force; - if (ac < 2 && !opts.new_branch) { + if (ac < 2 && !opts.new_branch && !opts.detach) { int n; const char *s = worktree_basename(path, &n); opts.new_branch = xstrndup(s, n); |