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

Re: [PATCH 4/4] remote: check branch names

From
Patrick Steinhardt <ps@pks.im>
Date
Sep 12, 2024, 10:05 UTC
Message-ID
<ZuK80YvPSo8WUpp2@pks.im>
In-Reply-To
<xmqqfrq686n5.fsf@gitster.g>
On Wed, Sep 11, 2024 at 10:03:26AM -0700, Junio C Hamano wrote:
Show 39 quoted lines
> "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
Previous: Junio C HamanoNext: Junio C Hamano
Message 17 of 22 in “remote: branch setting fixes”
  1. 0/4 remote: branch setting fixesPhillip Wood via GitGitGadget, Sep 11, 2024
  2. 1/4 remote: fix set-branches when no branches are setPhillip Wood via GitGitGadget, Sep 11, 2024
  3. Junio C HamanoSep 11, 2024
  4. Patrick SteinhardtSep 12, 2024
  5. 2/4 remote: print an error if refspec cannot be removedPhillip Wood via GitGitGadget, Sep 11, 2024
  6. Junio C HamanoSep 11, 2024
  7. Patrick SteinhardtSep 12, 2024
  8. Junio C HamanoSep 12, 2024
  9. Patrick SteinhardtSep 13, 2024
  10. phillip.wood123@gmail.comSep 13, 2024
  11. Junio C HamanoSep 13, 2024
  12. 3/4 remote add: use strvec to store tracking branchesPhillip Wood via GitGitGadget, Sep 11, 2024
  13. Junio C HamanoSep 11, 2024
  14. Patrick SteinhardtSep 12, 2024
  15. 4/4 remote: check branch namesPhillip Wood via GitGitGadget, Sep 11, 2024
  16. Junio C HamanoSep 11, 2024
  17. Patrick SteinhardtSep 12, 2024
  18. Junio C HamanoSep 12, 2024
  19. phillip.wood123@gmail.comSep 13, 2024
  20. Junio C HamanoSep 13, 2024
  21. phillip.wood123@gmail.comSep 18, 2024
  22. Junio C HamanoSep 18, 2024

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.