summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-08-18 05:04:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-19 22:51:37 (GMT)
commitc659f55b31bb928688afd4ddfd94f8bea978ff1a (patch)
treec8f39adb88e6802bbb8a93f8e38581e489a2a080 /builtin
parentdaa0c3d9717624a62ce669252be832db12658ec0 (diff)
downloadgit-c659f55b31bb928688afd4ddfd94f8bea978ff1a.zip
git-c659f55b31bb928688afd4ddfd94f8bea978ff1a.tar.gz
git-c659f55b31bb928688afd4ddfd94f8bea978ff1a.tar.bz2
config: refactor get_colorbool function
For "git config --get-colorbool color.foo", we use a custom callback that looks not only for the key that the user gave us, but also for "diff.color" (for backwards compatibility) and "color.ui" (as a fallback). For the former, we use a custom variable to store the diff.color value. For the latter, though, we store it in the main "git_use_color_default" variable, turning on color.ui for any other parts of git that respect this value. In practice, this doesn't cause any bugs, because git-config runs without caring about git_use_color_default, and then exits. But it crosses module boundaries in an unusual and confusing way, and it makes refactoring color handling harder than it needs to be. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/config.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c
index 3a09296..0b4ecac 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -305,6 +305,7 @@ static void get_color(const char *def_color)
static int get_colorbool_found;
static int get_diff_color_found;
+static int get_color_ui_found;
static int git_get_colorbool_config(const char *var, const char *value,
void *cb)
{
@@ -313,7 +314,7 @@ static int git_get_colorbool_config(const char *var, const char *value,
else if (!strcmp(var, "diff.color"))
get_diff_color_found = git_config_colorbool(var, value);
else if (!strcmp(var, "color.ui"))
- git_use_color_default = git_config_colorbool(var, value);
+ get_color_ui_found = git_config_colorbool(var, value);
return 0;
}
@@ -327,7 +328,7 @@ static int get_colorbool(int print)
if (!strcmp(get_colorbool_slot, "color.diff"))
get_colorbool_found = get_diff_color_found;
if (get_colorbool_found < 0)
- get_colorbool_found = git_use_color_default;
+ get_colorbool_found = get_color_ui_found;
}
get_colorbool_found = want_color(get_colorbool_found);