Merge branch 'jc/apply-trailing-blank-removal' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index af13fcc440876f4b851724050548e399a4b90d31..0b77eb1fa4074fb8ed5ef4cd4c37513f49804e7e 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2404,6 +2404,8 @@ __gitk_main ()
 if [[ -n ${ZSH_VERSION-} ]]; then
        echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
 
+       autoload -U +X compinit && compinit
+
        __gitcomp ()
        {
                emulate -L zsh