diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2020-12-30 17:29:47 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-04 15:25:56 -0800 |
| commit | 7f94b78ddabdb49cde32b088ca66b422e7cda628 (patch) | |
| tree | 575e516ab25d3a43b48e35b2cad3d5e0afcfe4aa | |
| parent | Git 2.30 (diff) | |
| download | tgif-7f94b78ddabdb49cde32b088ca66b422e7cda628.tar.xz | |
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 <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | contrib/completion/git-completion.bash | 10 |
1 files 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 |