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

"color.diff = true" is not "always" anymore. 

Too many people got burned by setting color.diff and color.status to
true when they really should have set it to "auto".

This makes only "always" to do the unconditional colorization, and
change the meaning of "true" to the same as "auto": colorize only when
we are talking to a terminal.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2007-11-26 14:30:28 -08:00
parent d25430c5f8
commit 57f2b8424a
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
color.c
View File

@ -118,21 +118,27 @@ bad:

int git_config_colorbool(const char *var, const char *value)
{
if (!value)
return 1;
if (!strcasecmp(value, "auto")) {
if (isatty(1) || (pager_in_use && pager_use_color)) {
char *term = getenv("TERM");
if (term && strcmp(term, "dumb"))
return 1;
}
return 0;
if (value) {
if (!strcasecmp(value, "never"))
return 0;
if (!strcasecmp(value, "always"))
return 1;
if (!strcasecmp(value, "auto"))
goto auto_color;
}
if (!strcasecmp(value, "never"))

/* Missing or explicit false to turn off colorization */
if (!git_config_bool(var, value))
return 0;
if (!strcasecmp(value, "always"))
return 1;
return git_config_bool(var, value);

/* any normal truth value defaults to 'auto' */
auto_color:
if (isatty(1) || (pager_in_use && pager_use_color)) {
char *term = getenv("TERM");
if (term && strcmp(term, "dumb"))
return 1;
}
return 0;
}

static int color_vfprintf(FILE *fp, const char *color, const char *fmt,