From: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date: Fri, 18 Jun 2021 14:02:57 +0000 (+0200)
Subject: completion: bash: fix late declaration of __git_cmd_idx
X-Git-Tag: v2.33.0-rc0~85^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cea232194d4da32696df26f9b5ad00d5624621db;p=thirdparty%2Fgit.git

completion: bash: fix late declaration of __git_cmd_idx

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 <fabianw@mavt.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 7bce9a0112..7b1bbb90ce 100644
--- 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
 }