diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-10 22:14:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-10 22:14:58 +0200 |
| commit | 2df7683b6e1eace60994244da7d23ea96e17fdc6 (patch) | |
| tree | ca70d9bea54f2bf11c4fd69d90daa29d21fa6d6f | |
| parent | Revert "completion: don't declare 'local words' to make zsh happy" (diff) | |
| parent | git-completion: fix regression in zsh support (diff) | |
| download | git-2df7683b6e1eace60994244da7d23ea96e17fdc6.tar.xz git-2df7683b6e1eace60994244da7d23ea96e17fdc6.zip | |
Merge branch 'fc/completion-zsh' into sg/completion-updates
* 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 8ee82cbae5..d6ddf81d69 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2608,6 +2608,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 prev @@ -2659,6 +2663,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 local cur words cword prev |