undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

completion: split _git_config()

Browse Source 
_git_config() contains two enormous case statements, one to complete
configuration sections and variable names, and the other to complete
their values.

Split these out into two separate helper functions, so in the next
patches we can use them to implement completion for 'git -c <TAB>'.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor 2019-08-13 14:26:48 +02:00 committed by Junio C Hamano
parent d9ee1e0617
commit 42d0efec59
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
contrib/completion/git-completion.bash
View File

@ -2228,7 +2228,8 @@ __git_compute_config_vars ()
__git_config_vars="$(git help --config-for-completion | sort -u)"
}
_git_config ()
# Completes possible values of various configuration variables.
__git_complete_config_variable_value ()
{
local varname
@ -2320,19 +2321,16 @@ _git_config ()
__gitcomp "7bit 8bit quoted-printable base64"
return
;;
--get|--get-all|--unset|--unset-all)
__gitcomp_nl "$(__git_config_get_set_variables)"
return
;;
*.*)
return
;;
esac
}
# Completes configuration sections, subsections, variable names.
__git_complete_config_variable_name ()
{
case "$cur" in
--*)
__gitcomp_builtin config
return
;;
branch.*.*)
local pfx="${cur%.*}." cur_="${cur##*.}"
__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
@ -2407,6 +2405,29 @@ _git_config ()
print s "."
}
')"
;;
esac
}
_git_config ()
{
case "$prev" in
--get|--get-all|--unset|--unset-all)
__gitcomp_nl "$(__git_config_get_set_variables)"
return
;;
*.*)
__git_complete_config_variable_value
return
;;
esac
case "$cur" in
--*)
__gitcomp_builtin config
;;
*)
__git_complete_config_variable_name
;;
esac
}