[PATCH] bash-completion: don't add quoted space for ZSH (fix regression)
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Jan 14, 2012, 18:55 UTC
- Message-ID
- <1326567336-2173-1-git-send-email-Matthieu.Moy@imag.fr>
- In-Reply-To
- <20120114152030.GX30469@goldbirke>
Commit a31e626 (completion: optimize refs completion) introduced a regression for ZSH users: ref names were completed with a quoted trailing space (i.e. "git checkout ma" completes to "git checkout master\ "). The space is convenient for bash users since we use "-o nospace", but a quoted space is worse than nothing. The absence of trailing space for ZSH is a long-standing issue, that this patch is not fixing. We just fix the regression by not appending a space when the shell is ZSH.
Original-patch-by: SZEDER Gábor <szeder@ira.uka.de> Reported-by: Stefan Haller <lists@haller-berlin.de> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- contrib/completion/git-completion.bash | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b0062ba..488e1f4 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -534,6 +534,12 @@ __gitcomp_nl () fi fi + # ZSH would quote the trailing space added with -S. bash users + # will appreciate the extra space to compensate the use of -o nospace. + if [ -n "${ZSH_VERSION-}" ] && [ "$suffix" = " " ]; then + suffix="" + fi + IFS=$s COMPREPLY=($(compgen -P "${2-}" -S "$suffix" -W "$1" -- "$cur_")) }
-- 1.7.9.rc0.25.gb9a1f.dirty