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

Re: [PATCH 4/7] refs.c: Refactor rules for expanding shorthand names into full refnames

From
Junio C Hamano <gitster@pobox.com>
Date
May 7, 2013, 01:36 UTC
Message-ID
<7v1u9jpo4m.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1367711749-8812-5-git-send-email-johan@herland.net>
Johan Herland <johan@herland.net> writes:
Show 42 quoted lines
> diff --git a/refs.c b/refs.c
> index 7231f54..8b02140 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1724,7 +1724,24 @@ const char *prettify_refname(const char *name)
>  		0);
>  }
>  
> -const char *ref_rev_parse_rules[] = {
> +static void ref_expand_txtly(const struct ref_expand_rule *rule,
> +			     char *dst, size_t dst_len,
> +			     const char *shortname, size_t shortname_len)
> +{
> +	mksnpath(dst, dst_len, rule->pattern, shortname_len, shortname);
> +}
> +
> +const struct ref_expand_rule ref_expand_rules[] = {
> +	{ ref_expand_txtly, "%.*s" },
> +	{ ref_expand_txtly, "refs/%.*s" },
> +	{ ref_expand_txtly, "refs/tags/%.*s" },
> +	{ ref_expand_txtly, "refs/heads/%.*s" },
> +	{ ref_expand_txtly, "refs/remotes/%.*s" },
> +	{ ref_expand_txtly, "refs/remotes/%.*s/HEAD" },
> +	{ NULL, NULL }
> +};
> +
> +static const char *ref_rev_parse_rules[] = {
>  	"%.*s",
>  	"refs/%.*s",
>  	"refs/tags/%.*s",
> @@ -1734,15 +1751,17 @@ const char *ref_rev_parse_rules[] = {
>  	NULL
>  };
>  
> -int refname_match(const char *abbrev_name, const char *full_name, const char **rules)
> +int refname_match(const char *abbrev_name, const char *full_name,
> +		  const struct ref_expand_rule *rules)
>  {
> -	const char **p;
> +	const struct ref_expand_rule *p;
>  	const int abbrev_name_len = strlen(abbrev_name);
> +	char n[PATH_MAX];

Hmmm, is it too much to ask to do this without a fixed length buffer? I think we have long learned the value of using strbuf to avoid having to worry about buffer overruns.

I am OK with the idea to make ref_expand_rules[] customizable, and the overall strategy taken by this step to refactor the current code looks reasonably sensible.

Previous: Johan HerlandNext: Johan Herland
Message 21 of 39 in “Make "$remote/$branch" work with unconventional refspecs”
  1. 0/7 Make "$remote/$branch" work with unconventional refspecsJohan Herland, May 4, 2013
  2. 1/7 shorten_unambiguous_ref(): Allow shortening refs/remotes/origin/HEAD to originJohan Herland, May 4, 2013
  3. Bert WesargMay 5, 2013
  4. Junio C HamanoMay 6, 2013
  5. Johan HerlandMay 7, 2013
  6. 1/3 t1514: Add tests of shortening refnames in strict/loose modeJohan Herland, May 7, 2013
  7. 2/3 t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"Johan Herland, May 7, 2013
  8. 3/3 shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to originJohan Herland, May 7, 2013
  9. Junio C HamanoMay 7, 2013
  10. Junio C HamanoMay 7, 2013
  11. Johan HerlandMay 7, 2013
  12. Junio C HamanoMay 7, 2013
  13. Johan HerlandMay 7, 2013
  14. 2/7 t7900: Start testing usability of namespaced remote refsJohan Herland, May 4, 2013
  15. Junio C HamanoMay 7, 2013
  16. Johan HerlandMay 7, 2013
  17. Junio C HamanoMay 7, 2013
  18. 3/7 t7900: Demonstrate failure to expand "$remote/$branch" according to refspecsJohan Herland, May 4, 2013
  19. Junio C HamanoMay 7, 2013
  20. 4/7 refs.c: Refactor rules for expanding shorthand names into full refnamesJohan Herland, May 4, 2013
  21. Junio C HamanoMay 7, 2013
  22. 5/7 refs.c: Refactor code for shortening full refnames into shorthand namesJohan Herland, May 4, 2013
  23. Junio C HamanoMay 7, 2013
  24. 6/7 refname_match(): Caller must declare if we're matching local or remote refsJohan Herland, May 4, 2013
  25. Junio C HamanoMay 7, 2013
  26. 7/7 refs.c: Add rules for resolving refs using remote refspecsJohan Herland, May 4, 2013
  27. Junio C HamanoMay 5, 2013
  28. Johan HerlandMay 5, 2013
  29. Junio C HamanoMay 5, 2013
  30. Johan HerlandMay 5, 2013
  31. Junio C HamanoMay 5, 2013
  32. Santi BéjarMay 6, 2013
  33. Santi BéjarMay 6, 2013
  34. Junio C HamanoMay 6, 2013
  35. Santi BéjarMay 6, 2013
  36. Junio C HamanoMay 6, 2013
  37. Junio C HamanoMay 6, 2013
  38. Johan HerlandMay 6, 2013
  39. Junio C HamanoMay 7, 2013

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.