Merge branch 'fc/completion-zsh' into sg/completion-updates

* fc/completion-zsh:
git-completion: fix regression in zsh support

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8ee82cbae5e3b7de06ccd50d77fb8d442564d6d5..d6ddf81d694abd0ec5c16c20e9a90acfbcb753f2 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2608,6 +2608,10 @@ _git ()
        if [[ -n ${ZSH_VERSION-} ]]; then
                emulate -L bash
                setopt KSH_TYPESET
+
+               # workaround zsh's bug that leaves 'words' as a special
+               # variable in versions < 4.3.12
+               typeset -h words
        fi
 
        local cur words cword prev
@@ -2659,6 +2663,10 @@ _gitk ()
        if [[ -n ${ZSH_VERSION-} ]]; then
                emulate -L bash
                setopt KSH_TYPESET
+
+               # workaround zsh's bug that leaves 'words' as a special
+               # variable in versions < 4.3.12
+               typeset -h words
        fi
 
        local cur words cword prev