mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fc/completion-zsh' into sg/completion-updates

Browse Source 
* fc/completion-zsh:
  git-completion: fix regression in zsh support
This commit is contained in:
Junio C Hamano
2011-05-10 13:14:58 -07:00
parent 1a0c9a305f 52fd972d59
commit 2df7683b6e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2608,6 +2608,10 @@ _git ()
if [[ -n ${ZSH_VERSION-} ]]; then if [[ -n ${ZSH_VERSION-} ]]; then
emulate -L bash emulate -L bash
setopt KSH_TYPESET setopt KSH_TYPESET
# workaround zsh's bug that leaves 'words' as a special
# variable in versions < 4.3.12
typeset -h words
fi fi
local cur words cword prev local cur words cword prev
@ -2659,6 +2663,10 @@ _gitk ()
if [[ -n ${ZSH_VERSION-} ]]; then if [[ -n ${ZSH_VERSION-} ]]; then
emulate -L bash emulate -L bash
setopt KSH_TYPESET setopt KSH_TYPESET
# workaround zsh's bug that leaves 'words' as a special
# variable in versions < 4.3.12
typeset -h words
fi fi
local cur words cword prev local cur words cword prev