[PATCH v2 1/3] completion: bash: add __git_have_func helper
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Dec 29, 2020, 17:08 UTC
- Message-ID
- <20201229170837.297857-2-felipe.contreras@gmail.com>
- In-Reply-To
- <20201229170837.297857-1-felipe.contreras@gmail.com>
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 --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 463a3124da..869c73ee2c 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3358,15 +3358,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
-- 2.30.0