[PATCH 4/6] completion: remove zsh hack
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Apr 30, 2014, 11:07 UTC
- Message-ID
- <1398856065-2982-5-git-send-email-felipe.contreras@gmail.com>
- In-Reply-To
- <1398856065-2982-1-git-send-email-felipe.contreras@gmail.com>
We don't want to override the 'complete()' function in zsh, which can be used by bashcomp.
Reported-by: Mark Lodato <lodato@google.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- contrib/completion/git-completion.bash | 1 + contrib/completion/git-completion.zsh | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index be0ea36..f1ce962 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2586,6 +2586,7 @@ __git_func_wrap () # This is NOT a public function; use at your own risk. __git_complete () { + test -n "$ZSH_VERSION" && return local wrapper="__git_wrap${2}" eval "$wrapper () { __git_func_wrap $2 ; }" complete -o bashdefault -o default -o nospace -F $wrapper $1 2>/dev/null \ diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 6432b3f..e71896a 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -16,12 +16,6 @@ # # fpath=(~/.zsh $fpath) -complete () -{ - # do nothing - return 0 -} - zstyle -T ':completion:*:*:git:*' tag-order && \ zstyle ':completion:*:*:git:*' tag-order 'common-commands'
-- 1.9.2+fc1.11.g71fb719