summaryrefslogtreecommitdiff
path: root/contrib/completion/git-completion.bash
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2019-08-13 12:26:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-13 19:31:04 (GMT)
commit42d0efec592ecd6bc8858ffb5d64fb0bbca827d4 (patch)
treee9e49bf27822fec920e6c952e0f5f3f542f08654 /contrib/completion/git-completion.bash
parentd9ee1e061783be43d10dee996b85bac0f9223ec4 (diff)
downloadgit-42d0efec592ecd6bc8858ffb5d64fb0bbca827d4.zip
git-42d0efec592ecd6bc8858ffb5d64fb0bbca827d4.tar.gz
git-42d0efec592ecd6bc8858ffb5d64fb0bbca827d4.tar.bz2
completion: split _git_config()
_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>
Diffstat (limited to 'contrib/completion/git-completion.bash')
-rw-r--r--contrib/completion/git-completion.bash39
1 files changed, 30 insertions, 9 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index fc437bf..3e9c5b6 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -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
}