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 <[email protected]> Signed-off-by: Felipe Contreras <[email protected]>
felipec · Oct 27, 2020 · d7c7498 · d7c7498
1 parent fb9a0f5
commit d7c7498
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/git-completion.zsh b/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 ()
 {