diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:36:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:36:33 -0700 |
| commit | 9e0ec12728dc3be3c0df4fa1ca4f7b8f33b89111 (patch) | |
| tree | 7538c35e640100d4fb7a4c0766a65f39e4b04678 | |
| parent | 5590fe762ff9d68f6968d80979e446576e61e2e1 (diff) | |
| parent | 52fd972d5922c95b44e49cd736f67d495a0175f1 (diff) | |
| download | git-9e0ec12728dc3be3c0df4fa1ca4f7b8f33b89111.tar.gz | |
Merge branch 'fc/completion-zsh' into maint
* fc/completion-zsh:
git-completion: fix regression in zsh support
| -rwxr-xr-x | contrib/completion/git-completion.bash | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 840ae38760..a7d20df233 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2710,6 +2710,10 @@ _git () if [[ -n ${ZSH_VERSION-} ]]; then emulate -L bash setopt KSH_TYPESET + + # workaround zsh's bug that leaves 'words' as a special + # variable in versions < 4.3.12 + typeset -h words fi local cur words cword @@ -2761,6 +2765,10 @@ _gitk () if [[ -n ${ZSH_VERSION-} ]]; then emulate -L bash setopt KSH_TYPESET + + # workaround zsh's bug that leaves 'words' as a special + # variable in versions < 4.3.12 + typeset -h words fi __git_has_doubledash && return |