diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2020-10-28 02:06:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-28 21:30:59 (GMT) |
| commit | 3791968bfe8485353f95e692c5a3891e4a02c5c4 (patch) | |
| tree | 1ac1a14edd65689d8ae77d496bb24e745228cd37 /contrib | |
| parent | aa1f1f8010db3ed9a35579f2e83c574650c41237 (diff) | |
| download | git-3791968bfe8485353f95e692c5a3891e4a02c5c4.zip git-3791968bfe8485353f95e692c5a3891e4a02c5c4.tar.gz git-3791968bfe8485353f95e692c5a3891e4a02c5c4.tar.bz2 | |
completion: fix conflict with bashcomp
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.zsh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index e567062..b894cb5 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 () { |