@matheusbsbs / matheus-bagliano / commits / edd8ad18a6

completion: fix zsh alias listing for subsection aliases

The zsh completion function __git_zsh_cmd_alias() uses 'git config --get-regexp' to enumerate aliases and then strips the "alias." prefix from each key. For subsection-style aliases (alias.name.command), this leaves "name.command" as the completion candidate instead of just "name". The bash completion does not have this problem because it goes through 'git --list-cmds=alias', which calls list_aliases() in C and already handles both alias syntaxes correctly. However, zsh needs both the alias name and its value for descriptive completion, which --list-cmds=alias does not provide. Add a hidden --aliases-for-completion option to 'git help', following the existing --config-for-completion pattern. It outputs NUL-separated "name\nvalue" pairs using list_aliases(), which correctly resolves both the traditional (alias.name) and subsection (alias.name.command) formats. Update __git_zsh_cmd_alias() to use it. Signed-off-by: Jonatan Holmgren <jonatan@jontes.page> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonatan Holmgren committed Feb 18, 2026 at 22:57 UTC edd8ad18a643d47dd92b08ab865bf7f4a26f50bc

2 files changed +14 -1

builtin/help.c

+13

@@ -54,6 +54,7 @@ static enum help_action {

54 HELP_ACTION_DEVELOPER_INTERFACES,

55 HELP_ACTION_CONFIG_FOR_COMPLETION,

56 HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION,

57 + HELP_ACTION_ALIASES_FOR_COMPLETION,

58 } cmd_mode;

60 static char *html_path;

@@ -90,6 +91,8 @@ static struct option builtin_help_options[] = {

91 HELP_ACTION_CONFIG_FOR_COMPLETION, PARSE_OPT_HIDDEN),

92 OPT_CMDMODE_F(0, "config-sections-for-completion", &cmd_mode, "",

93 HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION, PARSE_OPT_HIDDEN),

94 + OPT_CMDMODE_F(0, "aliases-for-completion", &cmd_mode, "",

95 + HELP_ACTION_ALIASES_FOR_COMPLETION, PARSE_OPT_HIDDEN),

97 OPT_END(),

98 };

@@ -691,6 +694,16 @@ int cmd_help(int argc,

694 help_format);

695 list_config_help(SHOW_CONFIG_SECTIONS);

696 return 0;

697 + case HELP_ACTION_ALIASES_FOR_COMPLETION: {

698 + struct string_list alias_list = STRING_LIST_INIT_DUP;

699 + opt_mode_usage(argc, "--aliases-for-completion", help_format);

700 + list_aliases(&alias_list);

701 + for (size_t i = 0; i < alias_list.nr; i++)

702 + printf("%s%c%s%c", alias_list.items[i].string, '\n',

703 + (char *)alias_list.items[i].util, '\0');

704 + string_list_clear(&alias_list, 1);

705 + return 0;

706 + }

707 case HELP_ACTION_CONFIG:

708 opt_mode_usage(argc, "--config", help_format);

709 setup_pager(the_repository);

contrib/completion/git-completion.zsh

+1 -1

@@ -202,7 +202,7 @@ __git_zsh_cmd_common ()

202 __git_zsh_cmd_alias ()

203 {

204 local -a list

205 - list=(${${(0)"$(git config -z --get-regexp '^alias\.*')"}#alias.})

205 + list=(${(0)"$(git help --aliases-for-completion)"})

206 list=(${(f)"$(printf "%s:alias for '%s'\n" ${(f@)list})"})

207 _describe -t alias-commands 'aliases' list && _ret=0

208 }