From 512b037bb7e0d9aaab0158ab06301259e487190a Mon Sep 17 00:00:00 2001 From: Yoichi NAKAYAMA Date: Thu, 20 Aug 2026 06:20:14 +0900 Subject: [PATCH] worktree add: shouldn't dwim if -b or -B is given 'git worktree add ' DWIMs to a remote-tracking branch when neither -b, -B, nor --detach is given. However, 'git worktree add -b ' can still DWIM , causing 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 --- builtin/worktree.c | 3 +++ t/t2400-worktree-add.sh | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/builtin/worktree.c b/builtin/worktree.c index 654d27c3e1ce99..15a1c9624a79db 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -897,6 +897,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; diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh index 87b926728ad8cf..ba3bec078fcdcc 100755 --- a/t/t2400-worktree-add.sh +++ b/t/t2400-worktree-add.sh @@ -621,6 +621,16 @@ test_expect_success '"add" dwims' ' ) ' +test_expect_success '"add" 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" dwims with checkout.defaultRemote' ' test_when_finished rm -rf repo_upstream repo_dwim foo && setup_remote_repo repo_upstream repo_dwim &&