summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorAndy Parkins <andyparkins@gmail.com>2006-12-13 09:13:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 09:47:36 (GMT)
commita159ca0cb7e0acdd37cb066327dcb020d95602d0 (patch)
tree168b3c978744f1bc43de4f7c1b3924969ea92c21 /config.c
parent25fb62905890d7860f742b4f2215fdf754ae7fee (diff)
downloadgit-a159ca0cb7e0acdd37cb066327dcb020d95602d0.zip
git-a159ca0cb7e0acdd37cb066327dcb020d95602d0.tar.gz
git-a159ca0cb7e0acdd37cb066327dcb020d95602d0.tar.bz2
Allow subcommand.color and color.subcommand color configuration
While adding colour to the branch command it was pointed out that a config option like "branch.color" conflicts with the pre-existing "branch.something" namespace used for specifying default merge urls and branches. The suggested solution was to flip the order of the components to "color.branch", which I did for colourising branch. This patch does the same thing for - git-log (color.diff) - git-status (color.status) - git-diff (color.diff) - pager (color.pager) I haven't removed the old config options; but they should probably be deprecated and eventually removed to prevent future namespace collisions. I've done this deprecation by changing the documentation for the config file to match the new names; and adding the "color.XXX" options to contrib/completion/git-completion.bash. Unfortunately git-svn reads "diff.color" and "pager.color"; which I don't like to change unilaterally. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'config.c')
-rw-r--r--config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.c b/config.c
index 3cae390..1bdef44 100644
--- a/config.c
+++ b/config.c
@@ -314,7 +314,7 @@ int git_default_config(const char *var, const char *value)
return 0;
}
- if (!strcmp(var, "pager.color")) {
+ if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) {
pager_use_color = git_config_bool(var,value);
return 0;
}