From f2f1b72080146080d3e71ba411fa033dc03eca9d Mon Sep 17 00:00:00 2001
From: Darcy Parker <darcyparker@gmail.com>
Date: Tue, 1 Dec 2020 22:15:55 -0500
Subject: [PATCH 1/2] Handle undefined __git_complete

Addresses https://github.com/jonas/tig/issues/1011

As identified in https://github.com/jonas/tig/issues/1011#issuecomment-736922515, there are cases where `__git_complete` is undefined because it is loaded dynamically by bash_completions.

As suggested in https://github.com/jonas/tig/issues/1011#issuecomment-736938541, using `pkg-config` to find `git-completion` script, which defines `__git_complete`.  And using approach similar to https://github.com/felipec/git-completion/blob/master/git-completion.zsh#L28-L49
---
 contrib/tig-completion.bash | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/contrib/tig-completion.bash b/contrib/tig-completion.bash
index 5aef3fd8f..7492b77b0 100755
--- a/contrib/tig-completion.bash
+++ b/contrib/tig-completion.bash
@@ -29,6 +29,27 @@
 #       at source time then all lookups will be done on demand,
 #       which may be slightly slower.
 
+#tig-completion requires __git_complete
+#* If not defined, source git completions script so __git_complete is available
+if ! declare -f __git_complete &>/dev/null; then
+  _bash_completion=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null) ||
+    _bash_completion='/usr/share/bash-completion/completions/'
+  _locations=(
+    "$(dirname "${BASH_SOURCE[0]%:*}")"/git-completion.bash #in same dir as this
+    "$HOME/.local/share/bash-completion/completions/git"
+    "$_bash_completion/git"
+    '/etc/bash_completion.d/git' # old debian
+    )
+  for _e in "${_locations[@]}"; do
+    # shellcheck disable=1090
+    test -f "$_e" && . "$_e" && break
+  done
+  unset _bash_completion _locations _e
+  if ! declare -f __git_complete &>/dev/null; then
+    return #silently return without completions
+  fi
+fi
+
 __tig_options="
 	-v --version
 	-h --help

From c12dd85e9d9e1a8f0b7f83aecc0de196b20a8e90 Mon Sep 17 00:00:00 2001
From: Darcy Parker <darcyparker@gmail.com>
Date: Tue, 8 Dec 2020 10:01:47 -0500
Subject: [PATCH 2/2] tig-completion.bash: Make indentation consistent (tabs)
 and removing trailing whitespace

---
 contrib/tig-completion.bash | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/contrib/tig-completion.bash b/contrib/tig-completion.bash
index 7492b77b0..efcef13a3 100755
--- a/contrib/tig-completion.bash
+++ b/contrib/tig-completion.bash
@@ -1,5 +1,5 @@
 # bash/zsh completion for tig
-# 
+#
 # Copyright (C) 2019 Roland Hieber, Pengutronix
 # Copyright (C) 2007-2010 Jonas fonseca
 #
@@ -32,22 +32,22 @@
 #tig-completion requires __git_complete
 #* If not defined, source git completions script so __git_complete is available
 if ! declare -f __git_complete &>/dev/null; then
-  _bash_completion=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null) ||
-    _bash_completion='/usr/share/bash-completion/completions/'
-  _locations=(
-    "$(dirname "${BASH_SOURCE[0]%:*}")"/git-completion.bash #in same dir as this
-    "$HOME/.local/share/bash-completion/completions/git"
-    "$_bash_completion/git"
-    '/etc/bash_completion.d/git' # old debian
-    )
-  for _e in "${_locations[@]}"; do
-    # shellcheck disable=1090
-    test -f "$_e" && . "$_e" && break
-  done
-  unset _bash_completion _locations _e
-  if ! declare -f __git_complete &>/dev/null; then
-    return #silently return without completions
-  fi
+	_bash_completion=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null) ||
+		_bash_completion='/usr/share/bash-completion/completions/'
+			_locations=(
+				"$(dirname "${BASH_SOURCE[0]%:*}")"/git-completion.bash #in same dir as this
+				"$HOME/.local/share/bash-completion/completions/git"
+				"$_bash_completion/git"
+				'/etc/bash_completion.d/git' # old debian
+			)
+			for _e in "${_locations[@]}"; do
+				# shellcheck disable=1090
+				test -f "$_e" && . "$_e" && break
+			done
+			unset _bash_completion _locations _e
+			if ! declare -f __git_complete &>/dev/null; then
+				return #silently return without completions
+			fi
 fi
 
 __tig_options="
@@ -116,7 +116,7 @@ fi
 
 # we use internal git-completion functions, so wrap _tig for all necessary
 # variables (like cword and prev) to be defined
-__git_complete tig _tig 
+__git_complete tig _tig
 
 # The following are necessary only for Cygwin, and only are needed
 # when the user has tab-completed the executable name and consequently