summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2019-08-13 12:26:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-13 19:31:04 (GMT)
commit840d7e5b3ca97f831b5af804a135a9cc79d9b919 (patch)
tree6cc11a4dd7e4f5b32e0ddf2b2ff22d0d5f12089c
parent08a12175d8b725d80efac41328780b57c4cfa6b1 (diff)
downloadgit-840d7e5b3ca97f831b5af804a135a9cc79d9b919.zip
git-840d7e5b3ca97f831b5af804a135a9cc79d9b919.tar.gz
git-840d7e5b3ca97f831b5af804a135a9cc79d9b919.tar.bz2
completion: complete more values of more 'color.*' configuration variables
Most 'color.*' configuration variables, with the sole exception of 'color.pager', accept the same set of values, but our completion script recognizes only about half of them. We could explicitly add all those missing variables, but let's try to reduce future maintenance burden, and use the catch-all 'color.*' pattern instead, so this list won't get out of sync when a similar new configuration variable accepting the same values is introduced [1]. Furthermore, their documentation explicitly mentions that they all accept the standard boolean values 'false' and 'true' as well, so list these, too, among the possible values. [1] OTOH, there will be a maintenance burden if ever a new 'color.something' is introduced which doesn't accept the same set of values. We'll see which one happens first... Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/completion/git-completion.bash9
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index cd9d8e1..c59347d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2277,11 +2277,6 @@ _git_config ()
__gitcomp "$__git_merge_strategies"
return
;;
- color.branch|color.diff|color.interactive|\
- color.showbranch|color.status|color.ui)
- __gitcomp "always never auto"
- return
- ;;
color.pager)
__gitcomp "false true"
return
@@ -2293,6 +2288,10 @@ _git_config ()
"
return
;;
+ color.*)
+ __gitcomp "false true always never auto"
+ return
+ ;;
diff.submodule)
__gitcomp "$__git_diff_submodule_formats"
return