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>
This commit is contained in:
parent
71ca53e812
commit
7f94b78dda
@ -3358,15 +3358,19 @@ __git_support_parseopt_helper () {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__git_have_func () {
|
||||||
|
declare -f $1 >/dev/null 2>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
__git_complete_command () {
|
__git_complete_command () {
|
||||||
local command="$1"
|
local command="$1"
|
||||||
local completion_func="_git_${command//-/_}"
|
local completion_func="_git_${command//-/_}"
|
||||||
if ! declare -f $completion_func >/dev/null 2>/dev/null &&
|
if ! __git_have_func $completion_func &&
|
||||||
declare -f _completion_loader >/dev/null 2>/dev/null
|
__git_have_func _completion_loader
|
||||||
then
|
then
|
||||||
_completion_loader "git-$command"
|
_completion_loader "git-$command"
|
||||||
fi
|
fi
|
||||||
if declare -f $completion_func >/dev/null 2>/dev/null
|
if __git_have_func $completion_func
|
||||||
then
|
then
|
||||||
$completion_func
|
$completion_func
|
||||||
return 0
|
return 0
|
||||||
|
Loading…
Reference in New Issue
Block a user