admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

environment: do not use strbuf_split*()

Browse Source 
environment.c:get_git_namespace() learns the raw namespace from an
environment variable, splits it at "/", and appends them after
"refs/namespaces/"; the reason why it splits first is so that an
empty string resulting from double slashes can be omitted.

The split pieces do not need to be edited in any way, so an array of
strbufs is a wrong data structure to use.  Instead split into a
string list and use the pieces from there.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2025-07-31 15:54:30 -07:00
parent dcecac2580
commit b894d4481f
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
environment.c
View File

@@ -163,10 +163,10 @@ int have_git_dir(void)
const char *get_git_namespace(void)
{
static const char *namespace;
struct strbuf buf = STRBUF_INIT;
struct strbuf **components, **c;
const char *raw_namespace;
struct string_list components = STRING_LIST_INIT_DUP;
struct string_list_item *item;
if (namespace)
return namespace;
@@ -178,12 +178,17 @@ const char *get_git_namespace(void)
}
strbuf_addstr(&buf, raw_namespace);
components = strbuf_split(&buf, '/');
string_list_split(&components, buf.buf, "/", -1);
strbuf_reset(&buf);
for (c = components; *c; c++)
if (strcmp((*c)->buf, "/") != 0)
strbuf_addf(&buf, "refs/namespaces/%s", (*c)->buf);
strbuf_list_free(components);
for_each_string_list_item(item, &components) {
if (item->string[0])
strbuf_addf(&buf, "refs/namespaces/%s/", item->string);
}
string_list_clear(&components, 0);
strbuf_trim_trailing_dir_sep(&buf);
if (check_refname_format(buf.buf, 0))
die(_("bad git namespace path \"%s\""), raw_namespace);
strbuf_addch(&buf, '/');