From: Patrick Steinhardt <ps@pks•im>
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>
Subject: Re: [PATCH 4/4] remote: check branch names
Date: Thu, 12 Sep 2024 12:05:05 +0200 [thread overview]
Message-ID: <ZuK80YvPSo8WUpp2@pks.im> (raw)
In-Reply-To: <xmqqfrq686n5.fsf@gitster.g>
On Wed, Sep 11, 2024 at 10:03:26AM -0700, Junio C Hamano wrote:
> "Phillip Wood via GitGitGadget" <gitgitgadget@gmail•com> writes:
>
> > +static int check_branch_names(const char **branches)
> > +{
> > + int ret = 0;
> > +
> > + for (const char **b = branches; *b; b++) {
> > + if (check_refname_format(*b, REFNAME_ALLOW_ONELEVEL |
> > + REFNAME_REFSPEC_PATTERN))
> > + ret = error(_("invalid branch name '%s'"), *b);
> > + }
> > +
> > + return ret;
> > +}
>
> This implementation is inconsistent with what "git branch new HEAD"
> uses to check the validity of "new", which is in this call chain:
>
> builtin/branch.c:cmd_branch()
> -> branch.c:create_branch()
> -> branch.c:validate_new_branchname()
> -> branch.c:validate_branchname()
> -> object-name.c:strbuf_check_branch_ref()
>
> At least, we should prepend "refs/heads/" to *b, so that we can
> reject "refs/heads/HEAD". The authoritative logic in the above
> however may further evolve, and we need to make sure that these two
> checks from drifting away from each other over time. We probably
> should refactor the leaf function in the above call chain so that
> both places can use it (the main difference is that you allow '*' in
> yours when calling check_refname_format()).
>
> Side note: we *should* lose "strbuf_" from its name, as it is
> not about string manipulation but the "strbuf'-ness
> of the function is merely that as the side effect of
> checking it computes a full refname and it happens to
> use strbuf as a mechanism to return it.
>
> Something like the patch attached at the end.
Agreed. It's also kind of curious that the function lives in
"object-name.c" and not in "refs.c".
Patrick
next prev parent reply other threads:[~2024-09-12 10:05 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 [this message]
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
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=ZuK80YvPSo8WUpp2@pks.im \
--to=ps@pks$(echo .)im \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=gitster@pobox$(echo .)com \
--cc=jhcarl0814@gmail$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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