[PATCH v3 12/29] completion: fix conflict with bashcomp
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Oct 28, 2020, 02:06 UTC
- Message-ID
- <20201028020712.442623-13-felipe.contreras@gmail.com>
- In-Reply-To
- <20201028020712.442623-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.zsh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index e567062505..b894cb52db 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' @@ -48,7 +42,11 @@ if [ -z "$script" ]; then test -f $e && script="$e" && break done fi + +local old_complete="$functions[complete]" +functions[complete]=: GIT_SOURCING_ZSH_COMPLETION=y . "$script" +functions[complete]="$old_complete" __gitcomp () {
-- 2.29.1