diff mbox series

[43/47] completion: bash: add __git_have_func helper

Message ID	20210101021622.798041-44-felipe.contreras@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: Felipe Contreras <felipe.contreras@gmail.com> To: git@vger.kernel.org Cc: =?utf-8?q?SZEDER_G=C3=A1bor?= <szeder.dev@gmail.com>, =?utf-8?b?Tmd1eQ==?= =?utf-8?b?4buFbiBUaMOhaSBOZ+G7jWMgRHV5?= <pclouds@gmail.com>, Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH 43/47] completion: bash: add __git_have_func helper Date: Thu, 31 Dec 2020 20:16:18 -0600 Message-Id: <20210101021622.798041-44-felipe.contreras@gmail.com> In-Reply-To: <20210101021622.798041-1-felipe.contreras@gmail.com> References: <20210101021622.798041-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	completion: git-completion 1.3 patches \| expand [00/47] completion: git-completion 1.3 patches [01/47] completion: bash: fix prefix detection in branch.* [02/47] completion: fix for suboptions with value [03/47] completion: bash: fix for multiple dash commands [04/47] completion: bash: add correct suffix in variables [05/47] completion: bash: do not modify COMP_WORDBREAKS [06/47] test: completion: fix currently typed words [07/47] test: completion: switch __gitcomp_nl prefix test [08/47] test: completion: add run_func() helper [09/47] completion: bash: remove non-append functionality [10/47] completion: bash: get rid of _append() functions [11/47] completion: bash: get rid of any non-append code [12/47] completion: zsh: fix options with arguments [13/47] completion: zsh: expand --git-dir file argument [14/47] completion: zsh: add support for general -C opts [15/47] completion: zsh: fix for undefined completions [16/47] completion: zsh: add support for general -c opts [17/47] completion: zsh: fix extra space on foo= [18/47] completion: zsh: add excluded options [19/47] completion: zsh: always set compset [20/47] completion: factor out check in __gitcomp [21/47] completion: simplify equal suffix check [22/47] completion: refactor __gitcomp [23/47] completion: simplify __gitcomp [24/47] completion: bash: change suffix check in __gitcomp [25/47] completion: improve __gitcomp suffix code [26/47] completion: bash: simplify config_variable_name [27/47] test: completion: add missing test [28/47] completion: bash: improve __gitcomp description [29/47] completion: add __gitcomp_opts [30/47] completion: bash: cleanup __gitcomp* invocations [31/47] completion: bash: shuffle __gitcomp functions [32/47] completion: zsh: simplify __gitcomp_direct [33/47] completion: zsh: shuffle __gitcomp* functions [34/47] completion: zsh: fix direct quoting [35/47] completion: zsh: add elements individually in __gitcomp_opts [36/47] completion: zsh: add __gitcompadd helper [37/47] completion: zsh: add correct removable suffix [38/47] completion: bash: simplify _get_comp_words_by_ref() [39/47] completion: bash: refactor _get_comp_words_by_ref() [40/47] completion: bash: cleanup _get_comp_words_by_ref() [41/47] completion: bash: trivial cleanup [42/47] completion: bash: rename _get_comp_words_by_ref() [43/47] completion: bash: add __git_have_func helper [44/47] completion: bash: improve function detection [45/47] test: completion: add tests for __git_complete [46/47] completion: add proper public __git_complete [47/47] completion: zsh: add higher-priority location

Commit Message

Felipe Contreras Jan. 1, 2021, 2:16 a.m. UTC

This makes the code more readable, and also will help when new code
wants to do similar checks.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 59f1563674..4bd3e706ac 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -3200,15 +3200,19 @@  __git_support_parseopt_helper () {
 	esac
 }
 
+__git_have_func () {
+	declare -f $1 >/dev/null 2>/dev/null
+}
+
 __git_complete_command () {
 	local command="$1"
 	local completion_func="_git_${command//-/_}"
-	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
-		declare -f _completion_loader >/dev/null 2>/dev/null
+	if ! __git_have_func $completion_func &&
+		__git_have_func _completion_loader
 	then
 		_completion_loader "git-$command"
 	fi
-	if declare -f $completion_func >/dev/null 2>/dev/null
+	if __git_have_func $completion_func
 	then
 		$completion_func
 		return 0