threads / patch / 56319

patchcompletion: tcsh: Fix regression by drop of wrapper functions

Subject: [PATCH] completion: tcsh: Fix regression by drop of wrapper functions

## tl;dr

2 messages between Aug 18, 2021 and Aug 18, 2021. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Takashi Iwai· Aug 18, 2021, 13:27 UTC · lore

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(-)

Show changes to contrib/completion/git-completion.tcsh +3 −2

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

-- 
2.26.2

Junio C Hamano· Aug 18, 2021, 20:57 UTC · re: Takashi Iwai · lore

Re: [PATCH] completion: tcsh: Fix regression by drop of wrapper functions

Takashi Iwai <tiwai@suse.de> writes:

Show 9 quoted lines

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

Show 16 quoted lines

> 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