git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Yoichi NAKAYAMA via GitGitGadget <gitgitgadget@gmail.com>
Date
Aug 4, 2026, 14:00 UTC
Message-ID
<pull.2192.git.1785852032626.gitgitgadget@gmail.com>
From: Yoichi NAKAYAMA <yoichi.nakayama@gmail.com>

'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 in v2.42.0 (128e5496b325640f0a09cc1d5b1e346c069b410f).

Signed-off-by: Yoichi NAKAYAMA <yoichi.nakayama@gmail.com>
---
    worktree add: shouldn't dwim if -b or -B is given
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2192%2Fyoichi%2Fworktree-add-should-not-dwim-with-b-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2192/yoichi/worktree-add-should-not-dwim-with-b-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2192
 builtin/worktree.c      |  2 +-
 t/t2400-worktree-add.sh | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 654d27c3e1..3204afdb12 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -897,7 +897,7 @@ 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) {
+	} else if (ac == 2 && !new_branch) {
 		struct object_id oid;
 		struct commit *commit;
 		char *remote;
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index 87b926728a..9cbf84861d 100755
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@ -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 foo &&
+	setup_remote_repo repo_upstream repo_dwim &&
+	git init repo_dwim &&
+	(
+		cd repo_dwim &&
+		test_must_fail git worktree add -b branch ../foo foo
+	)
+'
+
 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 &&

base-commit: 5b2471720c93ee30e5764a19f3d3b3ae9ec9712a
-- 
gitgitgadget
Next: Junio C Hamano
Message 1 of 10 in “worktree add: shouldn't dwim if -b or -B is given”
  1. worktree add: shouldn't dwim if -b or -B is givenYoichi NAKAYAMA via GitGitGadget, Aug 4, 2026
  2. Junio C HamanoAug 4, 2026
  3. Yoichi NakayamaAug 5, 2026
  4. worktree add: shouldn't dwim if -b or -B is givenYoichi NAKAYAMA via GitGitGadget, Aug 5, 2026
  5. Yoichi NakayamaAug 5, 2026
  6. Yoichi NakayamaAug 19, 2026
  7. worktree add: shouldn't dwim if -b or -B is givenYoichi NAKAYAMA via GitGitGadget, Aug 5, 2026
  8. Junio C HamanoAug 5, 2026
  9. worktree add: shouldn't dwim if -b or -B is givenYoichi NAKAYAMA via GitGitGadget, Aug 20, 2026
  10. Junio C HamanoAug 20, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.