From: Felipe Contreras Date: Wed, 30 Dec 2020 23:29:47 +0000 (-0600) Subject: completion: bash: add __git_have_func helper X-Git-Tag: v2.31.0-rc0~128^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f94b78ddabdb49cde32b088ca66b422e7cda628;p=thirdparty%2Fgit.git completion: bash: add __git_have_func helper This makes the code more readable, and also will help when new code wants to do similar checks. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- 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