git/contrib/completion/git-completion.zsh, branch jch

completion: fix zsh alias listing for subsection aliases

2026-02-19T18:13:20Z

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 Signed-off-by: Junio C Hamano

completion: zsh: stop leaking local cache variable

2024-04-30T22:24:56Z

Completing commands like "git rebase" in one repository will leak the local __git_repo_path into the shell's environment so that completing commands after changing to a different repository will give the old repository's references (or none at all). The bug report on the mailing list [1] suggests one simple way to observe this yourself: Enter the following commands from some directory: mkdir a b b/c for d (a b); git -C $d init && git -C $d commit --allow-empty -m init cd a git branch foo pushd ../b/c git branch bar Now type these: git rebase … # completion for bar available; C-c to abort declare -p __git_repo_path # outputs /path/to/b/.git popd git branch # outputs foo, main git rebase … # completion candidates are bar, main! Ideally, the last typed should be yielding foo, main. Commit beb6ee7163 (completion: extract repository discovery from __gitdir(), 2017-02-03) anticipated this problem by marking __git_repo_path as local in __git_main and __gitk_main for Bash completion but did not give the same mark to _git for Zsh completion. Thus make __git_repo_path local for Zsh completion, too. [1]: https://lore.kernel.org/git/CALnO6CBv3+e2WL6n6Mh7ZZHCX2Ni8GpvM4a-bQYxNqjmgZdwdg@mail.gmail.com/ Signed-off-by: D. Ben Knoble Signed-off-by: Junio C Hamano

contrib/completion: fix zsh completion regression from 59d85a2a05

2021-06-02T03:49:40Z

A recent change to make git-completion.bash use $__git_cmd_idx in more places broke a number of completions on zsh because it modified __git_main but did not update __git_zsh_main. Notably, completions for "add", "branch", "mv" and "push" were broken as a result of this change. In addition to the undefined variable usage, "git mv " also prints the following error: __git_count_arguments:7: bad math expression: operand expected at `"1"' _git_mv:[:7: unknown condition: -gt Remove the quotes around $__git_cmd_idx in __git_count_arguments and set __git_cmd_idx=1 early in __git_zsh_main to fix the regressions from 59d85a2a05. This was tested on zsh 5.7.1 (x86_64-apple-darwin19.0). Suggested-by: Felipe Contreras Signed-off-by: David Aguilar Acked-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: zsh: fix file completion regression

2020-12-01T18:32:40Z

Turns out we always need to set the ignored prefix (compset) to have similar behavior as in default Bash. The issue can be seen with: git show master: Commit 94b2901cfe wrongly removed it. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

zsh: update copyright notices

2020-10-28T21:31:19Z

Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: zsh: add simple version check

2020-10-28T21:30:59Z

A lot of people are confused about which completion script they are using; Zsh's Git script, or Git's Zsh script. Add a simple helper so they can type 'git zsh' and find out if they are running the correct one: this. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: zsh: trivial simplification

2020-10-28T21:30:59Z

>From upstream bash simplification: d9ee1e0617 (completion: simplify inner 'case' pattern in __gitcomp()) Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: zsh: add alias descriptions

2020-10-28T21:30:59Z

Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: zsh: improve command tags

2020-10-28T21:30:59Z

There's no need to use _alternative and repeat a lot of the code. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: zsh: refactor command completion

2020-10-28T21:30:59Z

Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano