From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 May 2011 20:14:58 +0000 (-0700)
Subject: Merge branch 'fc/completion-zsh' into sg/completion-updates
X-Git-Tag: v1.7.6-rc0~65^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2df7683b6e1eace60994244da7d23ea96e17fdc6;p=git.git

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

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

2df7683b6e1eace60994244da7d23ea96e17fdc6
diff --cc contrib/completion/git-completion.bash
index 8ee82cbae,a7d20df23..d6ddf81d6
--- a/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