@matheusbsbs / matheus-bagliano / commits / 0b18023d00

contrib/completion: fix zsh completion regression from 59d85a2a05

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 <tab>" 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 <felipe.contreras@gmail.com> Signed-off-by: David Aguilar <davvid@gmail.com> Acked-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

David Aguilar committed Jun 1, 2021 at 13:52 UTC 0b18023d000ed8c0851a025fcd4fd518cb2df673

2 files changed +2 -2

contrib/completion/git-completion.bash

+1 -1

@@ -1306,7 +1306,7 @@ __git_count_arguments ()

1306 local word i c=0

1307

1308 # Skip "git" (first argument)

1309 - for ((i="$__git_cmd_idx"; i < ${#words[@]}; i++)); do

1309 + for ((i=$__git_cmd_idx; i < ${#words[@]}; i++)); do

1310 word="${words[i]}"

1311

1312 case "$word" in

contrib/completion/git-completion.zsh

+1 -1

@@ -251,7 +251,7 @@ __git_zsh_main ()

251 done

252 ;;

253 (arg)

254 - local command="${words[1]}" __git_dir

254 + local command="${words[1]}" __git_dir __git_cmd_idx=1

255

256 if (( $+opt_args[--bare] )); then

257 __git_dir='.'