summaryrefslogtreecommitdiff
path: root/builtin-config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-06 06:12:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-06 07:05:10 (GMT)
commit69243c2b956d69636ae04c184bc8063a6fab728a (patch)
treec5ec018e9eae0d7b12c194e41287cce865d4d020 /builtin-config.c
parentb4c61ed6d35ea00494f953a27abbc902617972ec (diff)
downloadgit-69243c2b956d69636ae04c184bc8063a6fab728a.zip
git-69243c2b956d69636ae04c184bc8063a6fab728a.tar.gz
git-69243c2b956d69636ae04c184bc8063a6fab728a.tar.bz2
config --get-colorbool: diff.color is a deprecated synonym to color.diff
The applications can ask for color.diff but the configuration of old timer users can still instruct it to use color with diff.color this way. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-config.c')
-rw-r--r--builtin-config.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/builtin-config.c b/builtin-config.c
index d10b03f..e4a12e3 100644
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -210,11 +210,17 @@ static int get_color(int argc, const char **argv)
static int stdout_is_tty;
static int get_colorbool_found;
+static int get_diff_color_found;
static int git_get_colorbool_config(const char *var, const char *value)
{
- if (!strcmp(var, get_color_slot))
+ if (!strcmp(var, get_color_slot)) {
get_colorbool_found =
git_config_colorbool(var, value, stdout_is_tty);
+ }
+ if (!strcmp(var, "diff.color")) {
+ get_diff_color_found =
+ git_config_colorbool(var, value, stdout_is_tty);
+ }
return 0;
}
@@ -233,10 +239,18 @@ static int get_colorbool(int argc, const char **argv)
stdout_is_tty = isatty(1);
else
usage(git_config_set_usage);
- get_colorbool_found = 0;
+ get_colorbool_found = -1;
+ get_diff_color_found = -1;
get_color_slot = argv[0];
git_config(git_get_colorbool_config);
+ if (get_colorbool_found < 0) {
+ if (!strcmp(get_color_slot, "color.diff"))
+ get_colorbool_found = get_diff_color_found;
+ if (get_colorbool_found < 0)
+ get_colorbool_found = 0;
+ }
+
if (argc == 1) {
return get_colorbool_found ? 0 : 1;
} else {