completion: zsh: fix __gitcomp_direct()

Many callers append a space suffix, but zsh automatically appends a
space, making the completion add two spaces, for example:

  git log ma<tab>

Will complete 'master  '.

Let's remove that extra space.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0a96ad87e7b6d8723175d3b97c18921ddc737d7b..ec7dd12a4155e876ae3fddb77038e2d7dee93de0 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -3498,7 +3498,7 @@ if [[ -n ${ZSH_VERSION-} ]] &&
 
                local IFS=$'\n'
                compset -P '*[=:]'
-               compadd -Q -- ${=1} && _ret=0
+               compadd -Q -- ${${=1}% } && _ret=0
        }
 
        __gitcomp_nl ()

diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index ce47e86b60c04c7a398c20ded985f4187e5d3533..2cefae943ae56612eb6e1d502cc06997e6ce7b56 100644 (file)
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -74,7 +74,7 @@ __gitcomp_direct ()
 
        local IFS=$'\n'
        compset -P '*[=:]'
-       compadd -Q -- ${=1} && _ret=0
+       compadd -Q -- ${${=1}% } && _ret=0
 }
 
 __gitcomp_nl ()