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.
Junio C Hamano committed
May 10, 2011 at 13:13 UTC
1a0c9a305f88f979171815cec3548a9caa87a320
1 file changed
+2
-6
contrib/completion/git-completion.bash
+2
-6
@@ -2608,11 +2608,9 @@ _git ()
2608
if [[ -n ${ZSH_VERSION-} ]]; then
2609
emulate -L bash
2610
setopt KSH_TYPESET
2611
- else
2612
- local words
2611
fi
2612
2615
- local cur cword prev
2613
+ local cur words cword prev
2614
_get_comp_words_by_ref -n =: cur words cword prev
2615
while [ $c -lt $cword ]; do
2616
i="${words[c]}"
@@ -2661,11 +2659,9 @@ _gitk ()
2659
if [[ -n ${ZSH_VERSION-} ]]; then
2660
emulate -L bash
2661
setopt KSH_TYPESET
2664
- else
2665
- local words
2662
fi
2663
2668
- local cur cword prev
2664
+ local cur words cword prev
2665
_get_comp_words_by_ref -n =: cur words cword prev
2666
2667
__git_has_doubledash && return