[PATCH v4 1/1] help: cleanup the contruction of keys_uniq
- From
Amisha Chhajed <amishhhaaaa@gmail.com>
- Date
- Feb 28, 2026, 10:46 UTC
- Message-ID
- <20260228104654.80831-2-amishhhaaaa@gmail.com>
- In-Reply-To
- <20260228104654.80831-1-amishhhaaaa@gmail.com>
From: Amisha Chhajed <136238836+amishhaa@users.noreply.github.com>
construction of keys_uniq depends on sort operation executed on keys before processing, which does not gurantee that keys_uniq will be sorted.
refactor the code to shift the sort operation after the processing to remove dependency on key's sort operation and strictly maintain the sorted order of keys_uniq. dedent sort -u and sed in tests and replace grep with sed.
Signed-off-by: Amisha Chhajed <136238836+amishhaa@users.noreply.github.com> --- builtin/help.c | 84 ++++++++++++++++++++++++++++++------------------- t/t0012-help.sh | 26 +++++++-------- 2 files changed, 65 insertions(+), 45 deletions(-)
diff --git a/builtin/help.c b/builtin/help.c index c09cbc8912..3658836d23 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -111,6 +111,49 @@ struct slot_expansion { int found; }; +static void set_config_vars(struct string_list *keys_uniq, struct string_list_item *var) +{ + struct strbuf sb = STRBUF_INIT; + const char *str = var->string; + const char *wildcard = strchr(str, '*'); + const char *tag = strchr(str, '<'); + const char *cut; + + if (wildcard && tag) + cut = wildcard < tag ? wildcard : tag; + else if (wildcard) + cut = wildcard; + else if (tag) + cut = tag; + else { + string_list_append(keys_uniq, str); + return; + } + + strbuf_add(&sb, str, cut - str); + string_list_append(keys_uniq, sb.buf); + strbuf_release(&sb); +} + +static void set_config_sections(struct string_list *keys_uniq, struct string_list_item *var) +{ + struct strbuf sb = STRBUF_INIT; + const char *str = var->string; + const char *dot = strchr(str, '.'); + const char *cut; + + if (dot) + cut = dot; + else { + set_config_vars(keys_uniq, var); + return; + } + + strbuf_add(&sb, str, cut - str); + string_list_append(keys_uniq, sb.buf); + strbuf_release(&sb); +} + static void list_config_help(enum show_config_type type) { struct slot_expansion slot_expansions[] = { @@ -156,50 +199,27 @@ static void list_config_help(enum show_config_type type) BUG("slot_expansion %s.%s is not used", e->prefix, e->placeholder); - string_list_sort(&keys); for (size_t i = 0; i < keys.nr; i++) { - const char *var = keys.items[i].string; - const char *wildcard, *tag, *cut; - const char *dot = NULL; - struct strbuf sb = STRBUF_INIT; - switch (type) { case SHOW_CONFIG_HUMAN: - puts(var); - continue; + string_list_append(&keys_uniq, keys.items[i].string); + break; case SHOW_CONFIG_SECTIONS: - dot = strchr(var, '.'); + set_config_sections(&keys_uniq, &keys.items[i]); break; case SHOW_CONFIG_VARS: + set_config_vars(&keys_uniq, &keys.items[i]); break; + default: + BUG("%d: unexpected type", type); } - wildcard = strchr(var, '*'); - tag = strchr(var, '<'); - - if (!dot && !wildcard && !tag) { - string_list_append(&keys_uniq, var); - continue; - } - - if (dot) - cut = dot; - else if (wildcard && !tag) - cut = wildcard; - else if (!wildcard && tag) - cut = tag; - else - cut = wildcard < tag ? wildcard : tag; - - strbuf_add(&sb, var, cut - var); - string_list_append(&keys_uniq, sb.buf); - strbuf_release(&sb); - } - string_list_clear(&keys, 0); - string_list_remove_duplicates(&keys_uniq, 0); + + string_list_sort_u(&keys_uniq, 0); for_each_string_list_item(item, &keys_uniq) puts(item->string); string_list_clear(&keys_uniq, 0); + string_list_clear(&keys, 0); } static enum help_format parse_help_format(const char *format) diff --git a/t/t0012-help.sh b/t/t0012-help.sh index d3a0967e9d..03104b3bf4 100755 --- a/t/t0012-help.sh +++ b/t/t0012-help.sh @@ -141,20 +141,20 @@ test_expect_success 'git help -c' ' '\''git help config'\'' for more information EOF - grep -v -E \ - -e "^[^.]+\.[^.]+$" \ - -e "^[^.]+\.[^.]+\.[^.]+$" \ + sed \ + -e "/^[^.]*\.[^.]*$/d" \ + -e "/^[^.]*\.[^.]*\.[^.]*$/d" \ help.output >actual && test_cmp expect actual ' test_expect_success 'git help --config-for-completion' ' git help -c >human && - grep -E \ - -e "^[^.]+\.[^.]+$" \ - -e "^[^.]+\.[^.]+\.[^.]+$" human | - sed -e "s/\*.*//" -e "s/<.*//" | - sort -u >human.munged && + sed -n \ + -e "/^[^.]*\.[^.]*$/p" \ + -e "/^[^.]*\.[^.]*\.[^.]*$/p" human | + sed -e "s/\*.*//" -e "s/<.*//" | + sort -u >human.munged && git help --config-for-completion >vars && test_cmp human.munged vars @@ -162,11 +162,11 @@ test_expect_success 'git help --config-for-completion' ' test_expect_success 'git help --config-sections-for-completion' ' git help -c >human && - grep -E \ - -e "^[^.]+\.[^.]+$" \ - -e "^[^.]+\.[^.]+\.[^.]+$" human | - sed -e "s/\..*//" | - sort -u >human.munged && + sed -n \ + -e "/^[^.]*\.[^.]*$/p" \ + -e "/^[^.]*\.[^.]*\.[^.]*$/p" human | + sed -e "s/\..*//" | + sort -u >human.munged && git help --config-sections-for-completion >sections && test_cmp human.munged sections
-- 2.52.0