All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"SZEDER Gábor" <szeder.dev@gmail.com>,
	"Felipe Contreras" <felipe.contreras@gmail.com>,
	"Mark Lodato" <lodato@google.com>
Subject: [PATCH v2 12/29] completion: fix conflict with bashcomp
Date: Sat, 24 Oct 2020 22:13:26 -0500	[thread overview]
Message-ID: <20201025031343.346913-13-felipe.contreras@gmail.com> (raw)
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


  parent reply	other threads:[~2020-10-25  3:14 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-25  3:13 [PATCH v2 00/29] completion: zsh: latest patches Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 01/29] completion: zsh: fix __gitcomp_direct() Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 02/29] completion: zsh: fix name due to broken autoloading Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 03/29] completion: zsh: fix bash script extension Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 04/29] completion: zsh: reorganize install instructions Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 05/29] completion: zsh: fix for directories with spaces Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 06/29] completion: zsh: update slave script locations Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 07/29] completion: prompt: fix color for Zsh Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 08/29] completion: zsh: fix for command aliasing Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 09/29] completion: bash: synchronize zsh wrapper Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 10/29] completion: bash: remove " Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 11/29] completion: zsh: fix completion for --no-.. options Felipe Contreras
2020-10-25  3:13 ` Felipe Contreras [this message]
2020-10-25  3:13 ` [PATCH v2 13/29] completion: zsh: add missing direct_append Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 14/29] completion: zsh: fix splitting of words Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 15/29] completion: zsh: simplify compadd functions Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 16/29] completion: zsh: simplify direct compadd Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 17/29] completion: zsh: trivial cleanup Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 18/29] completion: zsh: simplify nl_append Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 19/29] completion: zsh: simplify file_direct Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 20/29] completion: zsh: shuffle functions around Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 21/29] completion: zsh: refactor command completion Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 22/29] completion: zsh: improve command tags Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 23/29] completion: zsh: add alias descriptions Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 24/29] completion: zsh: trivial simplification Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 25/29] completion: zsh: add simple version check Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 26/29] completion: bash: trivial cleanup Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 27/29] completion: bash: cleanup cygwin check Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 28/29] completion: bash: remove old compat wrappers Felipe Contreras
2020-10-25  3:13 ` [PATCH v2 29/29] Update copyright notices Felipe Contreras
2020-10-27 20:14 ` [PATCH v2 00/29] completion: zsh: latest patches Junio C Hamano
2020-10-28  1:48   ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201025031343.346913-13-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=lodato@google.com \
    --cc=szeder.dev@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.