[PATCH v2 12/29] completion: fix conflict with bashcomp
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Oct 25, 2020, 03:13 UTC
- Message-ID
- <20201025031343.346913-13-felipe.contreras@gmail.com>
- In-Reply-To
- <20201025031343.346913-1-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 26d6ee20b0..6de0e7b482 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3475,6 +3475,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 c2a90beb8b..1de9b9c80d 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -21,12 +21,6 @@ # zstyle ':completion:*:*:git:*' script ~/.git-completion.bash # -complete () -{ - # do nothing - return 0 -} - zstyle -T ':completion:*:*:git:*' tag-order && \ zstyle ':completion:*:*:git:*' tag-order 'common-commands'
-- 2.29.0