kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2007-12-05 22:12:07 -08:00
parent b4c61ed6d3
commit 69243c2b95
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin-config.c
View File

@ -210,11 +210,17 @@ static int get_color(int argc, const char **argv)


static int stdout_is_tty; static int stdout_is_tty;
static int get_colorbool_found; static int get_colorbool_found;
static int get_diff_color_found;
static int git_get_colorbool_config(const char *var, const char *value) 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 = get_colorbool_found =
git_config_colorbool(var, value, stdout_is_tty); 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; return 0;
} }


@ -233,10 +239,18 @@ static int get_colorbool(int argc, const char **argv)
stdout_is_tty = isatty(1); stdout_is_tty = isatty(1);
else else
usage(git_config_set_usage); usage(git_config_set_usage);
get_colorbool_found = 0; get_colorbool_found = -1;
get_diff_color_found = -1;
get_color_slot = argv[0]; get_color_slot = argv[0];
git_config(git_get_colorbool_config); 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) { if (argc == 1) {
return get_colorbool_found ? 0 : 1; return get_colorbool_found ? 0 : 1;
} else { } else {