Revert "completion: don't declare 'local words' to make zsh happy"
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2011 20:13:50 +0000 (13:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2011 20:13:50 +0000 (13:13 -0700)
This reverts commit 3bee6a4733a1ff03b9cc659ea026c6dc17567d4d, as the fix
that will be used by upstream zsh folks should make it unnecessary.

contrib/completion/git-completion.bash

index 70897b30260cb449bcd7918f9c8542a433fb2f36..8ee82cbae5e3b7de06ccd50d77fb8d442564d6d5 100755 (executable)
@@ -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