kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

worktree add: shouldn't dwim if -b or -B is given 

'git worktree add <path> <branch>' DWIMs <branch> to a
remote-tracking branch when neither -b, -B, nor --detach
is given.

However, 'git worktree add -b <new-branch> <path> <branch>' can
still DWIM <branch>, causing <new-branch> to be ignored.  This is a
regression introduced by 128e5496b3 (worktree add: extend DWIM to
infer --orphan, 2023-05-17), which appeared in Git 2.42.

Signed-off-by: Yoichi NAKAYAMA <yoichi.nakayama@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Yoichi NAKAYAMA 2026-08-20 10:31:28 +00:00 committed by Junio C Hamano
parent e9019fcafe
commit 4958524c32
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/worktree.c
View File

@ -896,6 +896,9 @@ static int add(int ac, const char **av, const char *prefix,

/* DWIM: Infer --orphan when repo has no refs. */
opts.orphan = (!s) && dwim_orphan(&opts, !!opt_track, 1);
} else if (ac == 2 && new_branch) {
if (!strcmp(branch, "HEAD"))
can_use_local_refs(&opts);
} else if (ac == 2) {
struct object_id oid;
struct commit *commit;

10
t/t2400-worktree-add.sh
View File

@ -621,6 +621,16 @@ test_expect_success '"add" <path> <branch> dwims' '
)
'

test_expect_success '"add" <path> <branch> does not dwim with -b' '
test_when_finished rm -rf repo_upstream repo_dwim wt &&
setup_remote_repo repo_upstream repo_dwim &&
(
cd repo_dwim &&
test_must_fail git worktree add -b branch ../wt foo 2>actual &&
test_grep "^fatal: invalid reference: foo" actual
)
'

test_expect_success '"add" <path> <branch> dwims with checkout.defaultRemote' '
test_when_finished rm -rf repo_upstream repo_dwim foo &&
setup_remote_repo repo_upstream repo_dwim &&