summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-10 13:13:50 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-10 13:13:50 -0700
commit1a0c9a305f88f979171815cec3548a9caa87a320 (patch)
treec1254d3e18a32fd81fb79c7f1e775429f9264f43
parentdad4277529b856bffe07760ac3928d06b5424fdc (diff)
downloadgit-1a0c9a305f88f979171815cec3548a9caa87a320.tar.gz
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.
-rwxr-xr-xcontrib/completion/git-completion.bash8
1 files 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