global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 03:00:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sg/completion-updates' into next

Browse Source 
* sg/completion-updates:
  Revert "completion: don't declare 'local words' to make zsh happy"
  git-completion: fix regression in zsh support
This commit is contained in:
Junio C Hamano
2011-05-10 13:16:36 -07:00
parent 267a3aa38c 2df7683b6e
commit eaf5398c73
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/completion/git-completion.bash
View File

@@ -2608,11 +2608,13 @@ _git ()
if [[ -n ${ZSH_VERSION-} ]]; then
emulate -L bash
setopt KSH_TYPESET
else
local words
# workaround zsh's bug that leaves 'words' as a special
# variable in versions < 4.3.12
typeset -h 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 +2663,13 @@ _gitk ()
if [[ -n ${ZSH_VERSION-} ]]; then
emulate -L bash
setopt KSH_TYPESET
else
local words
# workaround zsh's bug that leaves 'words' as a special
# variable in versions < 4.3.12
typeset -h 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