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: https://git.lorimer.id.au/gitweb.git/diff_plain/2df7683b6e1eace60994244da7d23ea96e17fdc6?hp=1a0c9a305f88f979171815cec3548a9caa87a320

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 8ee82cbae5..d6ddf81d69 100755
--- 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