completion: bash: fix late declaration of __git_cmd_idx

Fabian Wermelinger · gitster · commit cea232194d4d · 2021-06-19T15:30:35.000+09:00
A recent update to contrib/completion/git-completion.bash causes bash to fail
auto complete custom commands that are wrapped with __git_func_wrap. Declaring
__git_cmd_idx=0 inside __git_func_wrap resolves the issue.

Signed-off-by: Fabian Wermelinger &lt;fabianw@mavt.ethz.ch&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -3506,6 +3506,7 @@ fi
 __git_func_wrap ()
 {
 	local cur words cword prev
+	local __git_cmd_idx=0
 	_get_comp_words_by_ref -n =: cur words cword prev
 	$1
 }

Original file line number	Diff line number	Diff line change
`@@ -3506,6 +3506,7 @@ fi`
`3506`	`3506`	`__git_func_wrap ()`
`3507`	`3507`	`{`
`3508`	`3508`	`local cur words cword prev`
	`3509`	`+ local __git_cmd_idx=0`
`3509`	`3510`	`_get_comp_words_by_ref -n =: cur words cword prev`
`3510`	`3511`	`$1`
`3511`	`3512`	`}`