From: Junio C Hamano <gitster@pobox.com>
To: "Yoichi NAKAYAMA via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Yoichi NAKAYAMA <yoichi.nakayama@gmail.com>
Subject: Re: [PATCH] worktree add: improve message for ambiguous remote branch name
Date: Sun, 09 Aug 2026 11:17:23 -0700 [thread overview]
Message-ID: <xmqqjypz9n0s.fsf@gitster.g> (raw)
In-Reply-To: <xmqqo6fc9swz.fsf@gitster.g> (Junio C. Hamano's message of "Sat, 08 Aug 2026 14:57:48 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>>> +static const char message_advice_ambiguous_remote_tracking_branch[] =
>>> + N_("If you meant to create a worktree from a remote tracking branch on,\n"
>>> + "e.g. 'origin', you can do so by fully qualifying the name:\n"
>>> + "\n"
>>> + " git worktree add <path> origin/<name>\n"
>>> + "\n"
>>> ...
>>> + char *remote = unique_tracking_name(*new_branch, &oid, &num_matches);
>>> + if (!opts->quiet && !remote && num_matches > 1) {
>>> + if (advice_enabled(ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME))
>>> + advise(_(message_advice_ambiguous_remote_tracking_branch));
>>> + warning(_("'%s' matched multiple (%d) remote tracking branches\n"), branchname, num_matches);
>>> + }
Sorry for piecemeal reviews, but I just noticed that you have a
terminating LF at the end of a single-liner warning message. As
die/error/warning ffamily of helpers give the terminating newline
themselves, you must not. Unless you want to leave a blank line
after your message, that is.
Thanks.
next prev parent reply other threads:[~2026-08-09 18:17 UTC|newest]
Thread overview: 19+ 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 [this message]
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-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-11 6:35 ` [PATCH v4] " 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=xmqqjypz9n0s.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox