Re: [PATCH] bash-completion: don't add quoted space for ZSH (fix regression)
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] bash-completion: don't add quoted space for ZSH (fix regression) · Felipe Contreras <hidden>
- 2016-06-15 · Re: [PATCH] bash-completion: don't add quoted space for ZSH (fix regression) · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] bash-completion: don't add quoted space for ZSH (fix regression) · Matthieu Moy <hidden>
- 2016-06-15 · Re: [PATCH] bash-completion: don't add quoted space for ZSH (fix regression) · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] bash-completion: don't add quoted space for ZSH (fix regression) · Felipe Contreras <hidden>
Matthieu Moy [off-list ref] writes:
quoted hunk
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
This should take care of the SP set by the beginning of the helper
function
local cur_="$cur" suffix=" "
but is that the right thing to do if suffix came from "$4"?
As far as I can see, "$4" is used to append "." in very limited cases, and
nobody explicitly passes SP as "$4" when calling this, so it may be easier
to read if you moved this before that "if we have 3 or more args, use the
fourth one as the suffix" block, i.e. something like this?
contrib/completion/git-completion.bash | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index b0062ba..4ad75ed 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash@@ -525,7 +525,10 @@ __gitcomp () __gitcomp_nl () { local s=$'\n' IFS=' '$'\t'$'\n' - local cur_="$cur" suffix=" " + local cur_="$cur" + # Because we use '-o nospace' under bash, we need to compensate + # for it by appending SP after completed word ourselves. + local suffix="${BASH_VERSION+ }" if [ $# -gt 2 ]; then cur_="$3"