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

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

diff --cc contrib/completion/git-completion.bash
index 8ee82cb,a7d20df..d6ddf81
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -2608,10 -2710,14 +2608,14 @@@ _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
 -      _get_comp_words_by_ref -n =: cur words cword
 +      local cur words cword prev
 +      _get_comp_words_by_ref -n =: cur words cword prev
        while [ $c -lt $cword ]; do
                i="${words[c]}"
                case "$i" in
@@@ -2659,13 -2765,15 +2663,17 @@@ _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
 +      _get_comp_words_by_ref -n =: cur words cword prev
 +
        __git_has_doubledash && return
  
 -      local cur
        local g="$(__gitdir)"
        local merge=""
        if [ -f "$g/MERGE_HEAD" ]; then