[PATCH v4] contrib/completion: fix zsh completion regression from 59d85a2a05

David Aguilar· Jun 1, 2021, 20:52 UTC · lore

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>
---
Changes since v3:

- Dropped the addition of "git" in the words array.
- This is effectively the as the v2 patch after Felipe's suggestsions.
- The difference between this patch and v2 is the Suggested-by trailer.

 contrib/completion/git-completion.bash | 2 +-
 contrib/completion/git-completion.zsh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Show changes to 2 files +2 −2

contrib/completion/git-completion.bash, contrib/completion/git-completion.zsh

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3c5739b905..b50c5d0ea3 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1306,7 +1306,7 @@ __git_count_arguments ()
 	local word i c=0
 
 	# Skip "git" (first argument)
-	for ((i="$__git_cmd_idx"; i < ${#words[@]}; i++)); do
+	for ((i=$__git_cmd_idx; i < ${#words[@]}; i++)); do
 		word="${words[i]}"
 
 		case "$word" in
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 6c56296997..cac6f61881 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -251,7 +251,7 @@ __git_zsh_main ()
 		done
 		;;
 	(arg)
-		local command="${words[1]}" __git_dir
+		local command="${words[1]}" __git_dir __git_cmd_idx=1
 
 		if (( $+opt_args[--bare] )); then
 			__git_dir='.'

-- 
2.32.0.rc2.1.gf67de2b3ac

Felipe Contreras· Jun 1, 2021, 23:40 UTC · re: David Aguilar · lore

RE: [PATCH v4] contrib/completion: fix zsh completion regression from 59d85a2a05

David Aguilar wrote:

> 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.

You might want to try this in the future to reference previous commits:

  % git show --quiet --format=reference
  59d85a2a05 (git-completion.bash: use $__git_cmd_idx in more places, 2021-04-22)

(one of the aliases I'm missing right now)

> Suggested-by: Felipe Contreras <felipe.contreras@gmail.com>
> Signed-off-by: David Aguilar <davvid@gmail.com>

I have not tested this particular version, but I have tested similar changes, and this should work:

Acked-by: Felipe Contreras <felipe.contreras@gmail.com>

-- 
Felipe Contreras

Denton Liu· Jun 2, 2021, 07:13 UTC · re: Felipe Contreras · lore

Re: [PATCH v4] contrib/completion: fix zsh completion regression from 59d85a2a05

On Tue, Jun 01, 2021 at 06:40:44PM -0500, Felipe Contreras wrote:

> I have not tested this particular version, but I have tested similar
> changes, and this should work:
> 
> Acked-by: Felipe Contreras <felipe.contreras@gmail.com>

FWIW, since I was the one who introduced the bug,

Acked-by: Denton Liu <liu.denton@gmail.com>

Thanks for your help, David and Felipe.

v4contrib/completion: fix zsh completion regression from 59d85a2a05