From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 May 2011 20:13:50 +0000 (-0700)
Subject: Revert "completion: don't declare 'local words' to make zsh happy"
X-Git-Tag: v1.7.6-rc0~65^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1a0c9a305f88f979171815cec3548a9caa87a320;p=git-core%2Fgit.git

Revert "completion: don't declare 'local words' to make zsh happy"

This reverts commit 3bee6a4733a1ff03b9cc659ea026c6dc17567d4d, as the fix
that will be used by upstream zsh folks should make it unnecessary.
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 70897b302..8ee82cbae 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2608,11 +2608,9 @@ _git ()
 	if [[ -n ${ZSH_VERSION-} ]]; then
 		emulate -L bash
 		setopt KSH_TYPESET
-	else
-		local words
 	fi
 
-	local cur cword prev
+	local cur words cword prev
 	_get_comp_words_by_ref -n =: cur words cword prev
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
@@ -2661,11 +2659,9 @@ _gitk ()
 	if [[ -n ${ZSH_VERSION-} ]]; then
 		emulate -L bash
 		setopt KSH_TYPESET
-	else
-		local words
 	fi
 
-	local cur cword prev
+	local cur words cword prev
 	_get_comp_words_by_ref -n =: cur words cword prev
 
 	__git_has_doubledash && return