[PATCH v7 09/49] completion: fix __git_cmd_idx regression for zsh
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Apr 1, 2023, 08:45 UTC
- Message-ID
- <20230401084626.304356-10-felipe.contreras@gmail.com>
- In-Reply-To
- <20230401084626.304356-1-felipe.contreras@gmail.com>
The commit 59d85a2a05 (git-completion.bash: use $__git_cmd_idx in more places, 2021-04-22) caused a regression when using __git_complete and a command relies on __git_cmd_idx. This was fixed in cea232194d (completion: bash: fix late declaration of __git_cmd_idx, 2021-06-18) but only for bash.
We need the function wrapper (__git_func_wrap in bash and _git in zsh) to define __git_cmd_idx.
Otherwise the equivalent of __git_complete in zsh fails:
compdef _git ga=git_add ga <tab> ga __git_find_on_cmdline:[:14: unknown condition: -lt
Reported-by: Harrison McCullough <mccullough.harrison@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- contrib/completion/git-completion.zsh | 2 +- t/t9904-completion-zsh.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 4f22e8f85b..d11f4765b6 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -267,7 +267,7 @@ __git_zsh_main () _git () { local _ret=1 - local cur cword prev + local cur cword prev __git_cmd_idx=0 cur=${words[CURRENT]} prev=${words[CURRENT-1]} diff --git a/t/t9904-completion-zsh.sh b/t/t9904-completion-zsh.sh index cb123261ab..b7e4029bf9 100755 --- a/t/t9904-completion-zsh.sh +++ b/t/t9904-completion-zsh.sh @@ -1140,4 +1140,10 @@ test_expect_failure 'options with value' ' EOF ' +test_expect_success 'main sets correct __git_cmd_idx' ' + echo modified > file1 && + touch file3 && + test_completion "compdef _git ga=git_add${LF}ga --update f" "file1" +' + test_done
-- 2.33.0