From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Aug 2021 20:57:23 GMT
Subject: Re: [PATCH] completion: tcsh: Fix regression by drop of wrapper functions
Message-ID: <xmqqtujm4gjw.fsf@gitster.g>
In-Reply-To: <20210818132729.26021-1-tiwai@suse.de>

Takashi Iwai <tiwai@suse.de> writes:

> The cleanup of old compat wrappers in bash completion caused a
> regression on tcsh completion that still uses them.
> Let's update the tcsh call site as well for addressing it.
>
> Fixes: 441ecdab37fe ("completion: bash: remove old compat wrappers")
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  contrib/completion/git-completion.tcsh | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Thanks.  Will queue.



> diff --git a/contrib/completion/git-completion.tcsh b/contrib/completion/git-completion.tcsh
> index 4a790d8f4ec1..ba797e5b3cd5 100644
> --- a/contrib/completion/git-completion.tcsh
> +++ b/contrib/completion/git-completion.tcsh
> @@ -80,8 +80,9 @@ else
>  	COMP_CWORD=\$((\${#COMP_WORDS[@]}-1))
>  fi
>  
> -# Call _git() or _gitk() of the bash script, based on the first argument
> -_\${1}
> +# Call __git_wrap__git_main() or __git_wrap__gitk_main() of the bash script,
> +# based on the first argument
> +__git_wrap__\${1}_main
>  
>  IFS=\$'\n'
>  if [ \${#COMPREPLY[*]} -eq 0 ]; then