From: phillip.wood123@gmail.com
To: Junio C Hamano <gitster@pobox.com>
Cc: Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Han Jiang <jhcarl0814@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Patrick Steinhardt <ps@pks.im>
Subject: Re: [PATCH 4/4] remote: check branch names
Date: Wed, 18 Sep 2024 14:18:39 +0100 [thread overview]
Message-ID: <82a08e44-3822-4a26-ad09-4ca1a9b44c11@gmail.com> (raw)
In-Reply-To: <xmqqy13vxx3m.fsf@gitster.g>
On 13/09/2024 18:49, Junio C Hamano wrote:
> phillip.wood123@gmail.com writes:
>
>> Thanks for the patch, I'll re-roll based on that. I wonder if we
>> really want to support "@{-N}" when setting remote tracking branches
>> though - should we be using INTERPRET_BRANCH_REMOTE instead when
>> calling strbuf_branchname()?
>
> Perhaps. Users try to use "-" in surprising places, though ;-)
strbuf_check_branch_ref() already rejects "-".
INTERPRET_BRANCH_REMOTE supports @{upstream} which might be useful but
then we will need to check it refers to the correct remote and expand it
when setting the fetch refspec so a boolean function to check if a name
is acceptable is insufficient. Given that "git remote set-branches" has
only ever supported "real" branch names and patterns on the command line
and no-one has complained I wonder if we're better off doing something like
if (strbuf_check_branch_ref(&buf, branch_name) ||
strcmp(buf.buf + 11, branch_name))
error(_("invalid branch name '%s'", branch_name));
where the "buf.buf + 11" skips "refs/heads/"
Best Wishes
Phillip
next prev parent reply other threads:[~2024-09-18 13:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-11 15:18 [PATCH 0/4] remote: branch setting fixes Phillip Wood via GitGitGadget
2024-09-11 15:18 ` [PATCH 1/4] remote: fix set-branches when no branches are set Phillip Wood via GitGitGadget
2024-09-11 20:45 ` Junio C Hamano
2024-09-12 10:04 ` Patrick Steinhardt
2024-09-11 15:18 ` [PATCH 2/4] remote: print an error if refspec cannot be removed Phillip Wood via GitGitGadget
2024-09-11 20:52 ` Junio C Hamano
2024-09-12 10:04 ` Patrick Steinhardt
2024-09-12 16:22 ` Junio C Hamano
2024-09-13 3:08 ` Patrick Steinhardt
2024-09-13 15:11 ` phillip.wood123
2024-09-13 17:38 ` Junio C Hamano
2024-09-11 15:18 ` [PATCH 3/4] remote add: use strvec to store tracking branches Phillip Wood via GitGitGadget
2024-09-11 17:05 ` Junio C Hamano
2024-09-12 10:05 ` Patrick Steinhardt
2024-09-11 15:18 ` [PATCH 4/4] remote: check branch names Phillip Wood via GitGitGadget
2024-09-11 17:03 ` Junio C Hamano
2024-09-12 10:05 ` Patrick Steinhardt
2024-09-12 16:32 ` Junio C Hamano
2024-09-13 15:09 ` phillip.wood123
2024-09-13 17:49 ` Junio C Hamano
2024-09-18 13:18 ` phillip.wood123 [this message]
2024-09-18 20:24 ` Junio C Hamano
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=82a08e44-3822-4a26-ad09-4ca1a9b44c11@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jhcarl0814@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
/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;
as well as URLs for NNTP newsgroup(s).