From 1a0c9a305f88f979171815cec3548a9caa87a320 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 10 May 2011 13:13:50 -0700 Subject: [PATCH] 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. --- contrib/completion/git-completion.bash | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 70897b3026..8ee82cbae5 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 -- 2.11.4.GIT