All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yoichi NAKAYAMA via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Harald Nordgren <haraldnordgren@gmail.com>,
	Yoichi Nakayama <yoichi.nakayama@gmail.com>,
	"D. Ben Knoble" <ben.knoble@gmail.com>,
	Yoichi NAKAYAMA <yoichi.nakayama@gmail.com>
Subject: [PATCH v8 0/4] worktree add: improve message for ambiguous remote branch name
Date: Tue, 25 Aug 2026 21:04:31 +0000	[thread overview]
Message-ID: <pull.2197.v8.git.1787691875.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2197.git.1786177301832.gitgitgadget@gmail.com>

'git worktree add ../foo-dir bar-topic' fails to dwim when there are
multiple remote branches with name `bar-topic'. But it doesn't display
meaningful message as 'git checkout bar-topic' does under the same
situation.

We improve this by adding advice and modify the error message for worktree
add.

By Junio's suggestion, we include matched remote names in the advice. It is
applied to checkout, too.

We also fix the behavior of --guess-remote when there are multiple matches.

Changes from the previous patch:

 * add another commit to fix the behavior of --guess-remote

Yoichi NAKAYAMA (4):
  checkout: extract function to display advice for ambiguous remotes
  checkout: improve message for ambiguous remote branch name
  worktree add: improve message for ambiguous remote branch name
  worktree add: treat multiple matches with --guess-remote as an error

 Documentation/config/worktree.adoc |  5 +-
 Documentation/git-worktree.adoc    |  4 +-
 builtin/checkout.c                 | 76 ++++++++++++++++++------------
 builtin/worktree.c                 | 57 +++++++++++++++++++---
 checkout.c                         | 14 +++++-
 checkout.h                         |  5 +-
 t/t2400-worktree-add.sh            | 17 ++++++-
 7 files changed, 134 insertions(+), 44 deletions(-)


base-commit: dea0ea3582e6980ddbc1173cc8e3e9f9db91cde0
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2197%2Fyoichi%2Fimprove-worktree-add-error-message-v8
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2197/yoichi/improve-worktree-add-error-message-v8
Pull-Request: https://github.com/gitgitgadget/git/pull/2197

Range-diff vs v7:

 1:  e3f7d88520 = 1:  e3f7d88520 checkout: extract function to display advice for ambiguous remotes
 2:  89c0f4d303 = 2:  89c0f4d303 checkout: improve message for ambiguous remote branch name
 3:  095a5796d4 = 3:  095a5796d4 worktree add: improve message for ambiguous remote branch name
 -:  ---------- > 4:  927856e0a0 worktree add: treat multiple matches with --guess-remote as an error

-- 
gitgitgadget

  parent reply	other threads:[~2026-08-25 21:04 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-08  8:21 [PATCH] worktree add: improve message for ambiguous remote branch name Yoichi NAKAYAMA via GitGitGadget
2026-08-08 17:00 ` Junio C Hamano
2026-08-08 21:57   ` Junio C Hamano
2026-08-09  7:45     ` Harald Nordgren
2026-08-09 18:19       ` Junio C Hamano
2026-08-10 10:12         ` Harald Nordgren
2026-08-09 18:17     ` Junio C Hamano
2026-08-10 13:04     ` Yoichi Nakayama
2026-08-10 13:00   ` Yoichi Nakayama
2026-08-10 13:07 ` D. Ben Knoble
2026-08-10 13:35   ` Yoichi Nakayama
2026-08-10 15:06     ` Junio C Hamano
2026-08-10 21:36   ` Yoichi Nakayama
2026-08-11 16:38     ` Ben Knoble
2026-08-12 13:14       ` Yoichi Nakayama
2026-08-10 15:07 ` [PATCH v2] " Yoichi NAKAYAMA via GitGitGadget
2026-08-10 20:55 ` [PATCH v3] " Yoichi NAKAYAMA via GitGitGadget
2026-08-11  0:03   ` Junio C Hamano
2026-08-11  6:31     ` Yoichi Nakayama
2026-08-12 19:22       ` Junio C Hamano
2026-08-15  4:36         ` Yoichi Nakayama
2026-08-11  6:35 ` [PATCH v4] " Yoichi NAKAYAMA via GitGitGadget
2026-08-19 12:50 ` [PATCH v5 0/2] " Yoichi NAKAYAMA via GitGitGadget
2026-08-19 12:50   ` [PATCH v5 1/2] checkout: " Yoichi NAKAYAMA via GitGitGadget
2026-08-19 22:54     ` D. Ben Knoble
2026-08-20  2:18       ` Junio C Hamano
2026-08-20 15:41         ` Yoichi Nakayama
2026-08-19 12:50   ` [PATCH v5 2/2] worktree add: " Yoichi NAKAYAMA via GitGitGadget
2026-08-20 21:03 ` [PATCH v6 0/3] " Yoichi NAKAYAMA via GitGitGadget
2026-08-20 21:03   ` [PATCH v6 1/3] checkout: extract function to display advice for ambiguous remotes Yoichi NAKAYAMA via GitGitGadget
2026-08-20 21:03   ` [PATCH v6 2/3] checkout: improve message for ambiguous remote branch name Yoichi NAKAYAMA via GitGitGadget
2026-08-20 21:03   ` [PATCH v6 3/3] worktree add: " Yoichi NAKAYAMA via GitGitGadget
2026-08-21  3:54     ` Junio C Hamano
2026-08-21 23:15       ` Yoichi Nakayama
2026-08-21 23:49         ` Junio C Hamano
2026-08-22  0:50           ` Yoichi Nakayama
2026-08-22 17:22             ` Junio C Hamano
2026-08-24 22:25               ` Yoichi Nakayama
2026-08-22  3:22 ` [PATCH v7 0/3] " Yoichi NAKAYAMA via GitGitGadget
2026-08-22  3:22   ` [PATCH v7 1/3] checkout: extract function to display advice for ambiguous remotes Yoichi NAKAYAMA via GitGitGadget
2026-08-22  3:22   ` [PATCH v7 2/3] checkout: improve message for ambiguous remote branch name Yoichi NAKAYAMA via GitGitGadget
2026-08-22  3:22   ` [PATCH v7 3/3] worktree add: " Yoichi NAKAYAMA via GitGitGadget
2026-08-22 18:08   ` [PATCH v7 0/3] " Junio C Hamano
2026-08-25 21:04 ` Yoichi NAKAYAMA via GitGitGadget [this message]
2026-08-25 21:04   ` [PATCH v8 1/4] checkout: extract function to display advice for ambiguous remotes Yoichi NAKAYAMA via GitGitGadget
2026-08-25 21:04   ` [PATCH v8 2/4] checkout: improve message for ambiguous remote branch name Yoichi NAKAYAMA via GitGitGadget
2026-08-25 21:04   ` [PATCH v8 3/4] worktree add: " Yoichi NAKAYAMA via GitGitGadget
2026-08-25 21:04   ` [PATCH v8 4/4] worktree add: treat multiple matches with --guess-remote as an error Yoichi NAKAYAMA via GitGitGadget
2026-08-25 21:31     ` Junio C Hamano
2026-08-26 10:45 ` [PATCH v9 0/4] worktree add: improve message for ambiguous remote branch name Yoichi NAKAYAMA via GitGitGadget
2026-08-26 10:45   ` [PATCH v9 1/4] checkout: extract function to display advice for ambiguous remotes Yoichi NAKAYAMA via GitGitGadget
2026-08-26 15:24     ` Junio C Hamano
2026-08-26 10:45   ` [PATCH v9 2/4] checkout: improve message for ambiguous remote branch name Yoichi NAKAYAMA via GitGitGadget
2026-08-26 16:46     ` Junio C Hamano
2026-08-26 10:45   ` [PATCH v9 3/4] worktree add: " Yoichi NAKAYAMA via GitGitGadget
2026-08-26 10:45   ` [PATCH v9 4/4] worktree add: treat multiple matches with --guess-remote as an error Yoichi NAKAYAMA via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pull.2197.v8.git.1787691875.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=ben.knoble@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=haraldnordgren@gmail.com \
    --cc=yoichi.nakayama@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.