Merge branch 'fw/complete-cmd-idx-fix' into next

gitster · gitster · commit f16784c4cb6a · 2021-07-01T13:57:44.000-07:00
Recent update to completion script (in contrib/) broke those who
use the __git_complete helper to define completion to their custom
command.

* fw/complete-cmd-idx-fix:
  completion: bash: fix late declaration of __git_cmd_idx
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -3513,6 +3513,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
`@@ -3513,6 +3513,7 @@ fi`
`3513`	`3513`	`__git_func_wrap ()`
`3514`	`3514`	`{`
`3515`	`3515`	`local cur words cword prev`
	`3516`	`+ local __git_cmd_idx=0`
`3516`	`3517`	`_get_comp_words_by_ref -n =: cur words cword prev`
`3517`	`3518`	`$1`
`3518`	`3519`	`}`