From: Jonatan Holmgren Date: Tue, 10 Feb 2026 22:27:43 GMT Subject: [PATCH 1/3] help: use list_aliases() for alias listing Message-ID: <20260210222745.78575-2-jonatan@jontes.page> In-Reply-To: <20260210222745.78575-1-jonatan@jontes.page> help.c has its own get_alias() config callback that duplicates the parsing logic in alias.c. Consolidate by teaching list_aliases() to also store the alias values (via the string_list util field), then use it in list_all_cmds_help_aliases() instead of the private callback. This preserves the existing error checking for value-less alias definitions by checking in alias.c rather than help.c. No functional change intended. Signed-off-by: Jonatan Holmgren --- alias.c | 9 ++++++++- help.c | 17 ++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/alias.c b/alias.c index 1a1a141a0a..1f8e13610c 100644 --- a/alias.c +++ b/alias.c @@ -24,12 +24,19 @@ static int config_alias_cb(const char *key, const char *value, if (data->alias) { if (!strcasecmp(p, data->alias)) { + if (!value) + return config_error_nonbool(key); FREE_AND_NULL(data->v); return git_config_string(&data->v, key, value); } } else if (data->list) { - string_list_append(data->list, p); + struct string_list_item *item; + + item = string_list_append(data->list, p); + if (value) + item->util = xstrdup(value); + /* if !value, item->util remains NULL but item is still added */ } return 0; diff --git a/help.c b/help.c index fefd811f7a..0bdb7ca10f 100644 --- a/help.c +++ b/help.c @@ -20,6 +20,7 @@ #include "prompt.h" #include "fsmonitor-ipc.h" #include "repository.h" +#include "alias.h" #ifndef NO_CURL #include "git-curl-compat.h" /* For LIBCURL_VERSION only */ @@ -468,20 +469,6 @@ void list_developer_interfaces_help(void) putchar('\n'); } -static int get_alias(const char *var, const char *value, - const struct config_context *ctx UNUSED, void *data) -{ - struct string_list *list = data; - - if (skip_prefix(var, "alias.", &var)) { - if (!value) - return config_error_nonbool(var); - string_list_append(list, var)->util = xstrdup(value); - } - - return 0; -} - static void list_all_cmds_help_external_commands(void) { struct string_list others = STRING_LIST_INIT_DUP; @@ -501,7 +488,7 @@ static void list_all_cmds_help_aliases(int longest) struct cmdname_help *aliases; int i; - repo_config(the_repository, get_alias, &alias_list); + list_aliases(&alias_list); string_list_sort(&alias_list); for (i = 0; i < alias_list.nr; i++) { -- 2.53.0