From 4bfe18fd678efbde297293c917cbd752b8caf67a Mon Sep 17 00:00:00 2001
From: Zaq? Wiedmann <zaquestion@gmail.com>
Date: Tue, 2 Jul 2019 01:10:31 -0700
Subject: [PATCH] contrib/completion: use __git() in bash completor to avoid
 aliased tools

For users who alias git to other tools that wrap git (like lab or hub)
the existing completion script will use these aliased tools. Since
`__git` exists and is unlikely to be aliased, making it well suited to
ensure the completion script is actually calling git and not an aliased
tool.

Signed-off-by: Zaq? Wiedmann <zaquestion@gmail.com>
---
 contrib/completion/git-completion.bash | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 9f71bcde967bc5..135be710223f0c 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -55,7 +55,7 @@ __git_find_repo_path ()
 	fi
 
 	if [ -n "${__git_C_args-}" ]; then
-		__git_repo_path="$(git "${__git_C_args[@]}" \
+		__git_repo_path="$(__git "${__git_C_args[@]}" \
 			${__git_dir:+--git-dir="$__git_dir"} \
 			rev-parse --absolute-git-dir 2>/dev/null)"
 	elif [ -n "${__git_dir-}" ]; then
@@ -67,7 +67,7 @@ __git_find_repo_path ()
 	elif [ -d .git ]; then
 		__git_repo_path=.git
 	else
-		__git_repo_path="$(git rev-parse --git-dir 2>/dev/null)"
+		__git_repo_path="$(__git rev-parse --git-dir 2>/dev/null)"
 	fi
 }
 
@@ -379,7 +379,7 @@ fi
 
 # This function is equivalent to
 #
-#    __gitcomp "$(git xxx --git-completion-helper) ..."
+#    __gitcomp "$(__git xxx --git-completion-helper) ..."
 #
 # except that the output is cached. Accept 1-3 arguments:
 # 1: the git command to execute, this is also the cache key
@@ -1240,7 +1240,7 @@ _git_archive ()
 {
 	case "$cur" in
 	--format=*)
-		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
+		__gitcomp "$(__git archive --list)" "" "${cur##--format=}"
 		return
 		;;
 	--remote=*)
@@ -2185,7 +2185,7 @@ __git_config_vars=
 __git_compute_config_vars ()
 {
 	test -n "$__git_config_vars" ||
-	__git_config_vars="$(git help --config-for-completion | sort | uniq)"
+	__git_config_vars="$(__git help --config-for-completion | sort | uniq)"
 }
 
 _git_config ()