Apparently using "compadd -Q" is almost always wrong, we want zsh to add
quoting when necessary. However, if we remove the -Q option, that would
make zsh add an extra "\ " at the end of some completions.
We can manually remove the spaces from the completions that have them,
and then add the suffix with the -S option, thus there's no more need
for the -Q option.
This makes completions like "stash@{0}" complete correctly:
git stash show <tab>
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
contrib/completion/git-completion.zsh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index c4510a3180..3818291950 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -55,7 +55,7 @@ __gitcomp ()
emulate -L zsh
local IFS=$' \t\n'
- compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+ compadd -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
}
__gitcomp_opts ()
@@ -85,14 +85,17 @@ __gitcomp_opts ()
fi
array+=("$c$sfx")
done
- compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+ compadd -S '' -p "${2-}" -a -- array && _ret=0
}
__gitcomp_nl ()
{
emulate -L zsh
- compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
+ # words that don't end up in space
+ compadd -p "${2-}" -S "${4- }" -q -- ${${(f)1}:#*\ } && _ret=0
+ # words that end in space
+ compadd -p "${2-}" -S " ${4- }" -q -- ${${(M)${(f)1}:#*\ }% } && _ret=0
}
__gitcomp_file ()
--
2.32.0
