global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-28 02:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ac/help-sort-correctly' into jch

Browse Source 
The code in "git help" that shows configuration items in sorted
order was awkwardly organized and prone to bugs.

* ac/help-sort-correctly:
  SQUASH??? simplify
  help: cleanup the contruction of keys_uniq
This commit is contained in:
Junio C Hamano
2026-02-23 15:56:50 -08:00
parent 28b5131044 6d577915a3
commit 67d3616158
1 changed files with 72 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
builtin/help.c
View File

@@ -114,6 +114,66 @@ struct slot_expansion {
int found;
};
static void show_config_human(struct string_list *keys)
{
string_list_sort(keys);
for (size_t i = 0; i < keys->nr; i++) {
const char *var = keys->items[i].string;
puts(var);
}
}
static void grab_leading_part(struct string_list *keys, const char *var, int use_dot)
{
const char *cut = NULL;
if (use_dot)
cut = strchr(var, use_dot);
if (!cut) {
size_t prefix_len = strcspn(var, "*<");
if (var[prefix_len])
cut = var + prefix_len;
}
if (!cut)
string_list_append(keys, var);
else {
struct strbuf sb = STRBUF_INIT;
strbuf_add(&sb, var, cut - var);
string_list_append(keys, sb.buf);
strbuf_release(&sb);
}
}
static void show_config_sections(struct string_list *keys)
{
struct string_list keys_uniq = STRING_LIST_INIT_DUP;
struct string_list_item *item;
for (size_t i = 0; i < keys->nr; i++)
grab_leading_part(&keys_uniq, keys->items[i].string, '.');
string_list_sort_u(&keys_uniq, 0);
for_each_string_list_item(item, &keys_uniq)
puts(item->string);
string_list_clear(&keys_uniq, 0);
}
static void show_config_vars(struct string_list *keys)
{
struct string_list keys_uniq = STRING_LIST_INIT_DUP;
struct string_list_item *item;
for (size_t i = 0; i < keys->nr; i++)
grab_leading_part(&keys_uniq, keys->items[i].string, '\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);
}
static void list_config_help(enum show_config_type type)
{
struct slot_expansion slot_expansions[] = {
@@ -132,8 +192,6 @@ static void list_config_help(enum show_config_type type)
const char **p;
struct slot_expansion *e;
struct string_list keys = STRING_LIST_INIT_DUP;
struct string_list keys_uniq = STRING_LIST_INIT_DUP;
struct string_list_item *item;
for (p = config_name_list; *p; p++) {
const char *var = *p;
@@ -159,50 +217,20 @@ 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;
case SHOW_CONFIG_SECTIONS:
dot = strchr(var, '.');
break;
case SHOW_CONFIG_VARS:
break;
}
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);
switch (type) {
case SHOW_CONFIG_HUMAN:
show_config_human(&keys);
break;
case SHOW_CONFIG_SECTIONS:
show_config_sections(&keys);
break;
case SHOW_CONFIG_VARS:
show_config_vars(&keys);
break;
default:
BUG("%d: unexpected type", type);
}
string_list_clear(&keys, 0);
string_list_remove_duplicates(&keys_uniq, 0);
for_each_string_list_item(item, &keys_uniq)
puts(item->string);
string_list_clear(&keys_uniq, 0);
}
static enum help_format parse_help_format(const char *format)