Hi, Here's another try at completion fixes, cleanups, and more tests. Some of these have already been sent. Felipe Contreras (14): completion: zsh: fix __gitcomp_direct() completion: zsh: fix for directories with spaces completion: remove zsh hack completion: zsh: improve main function selection completion: prompt: fix color for Zsh completion: bash: cleanup cygwin check completion: zsh: update installation instructions completion: bash: remove old compat wrappers completion: bash: remove zsh wrapper completion: zsh: trivial cleanups test: completion: tests for __gitcomp regression test: completion: use global config completion: add default options completion: add default merge strategies contrib/completion/git-completion.bash | 202 +++++++++++++------------ contrib/completion/git-completion.zsh | 53 +++---- contrib/completion/git-prompt.sh | 10 +- t/t9902-completion.sh | 37 +++-- 4 files changed, 161 insertions(+), 141 deletions(-) -- 2.22.0