mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 19:13:58 +01:00
Code

Merge branch 'mk/color'

Browse Source 
* mk/color:
  Use color.ui variable in scripts too
This commit is contained in:
Junio C Hamano 2008-04-19 21:09:54 -07:00
commit dc46fa36b8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-config.txt
View File

@ -144,6 +144,8 @@ See also <<FILES>>.
"auto". If `stdout-is-tty` is missing, then checks the standard "auto". If `stdout-is-tty` is missing, then checks the standard
output of the command itself, and exits with status 0 if color output of the command itself, and exits with status 0 if color
is to be used, or exits with status 1 otherwise. is to be used, or exits with status 1 otherwise.
When the color setting for `name` is undefined, the command uses
`color.ui` as fallback.
--get-color name default:: --get-color name default::

6
builtin-config.c
View File

@ -240,6 +240,10 @@ static int git_get_colorbool_config(const char *var, const char *value)
get_diff_color_found = get_diff_color_found =
git_config_colorbool(var, value, stdout_is_tty); git_config_colorbool(var, value, stdout_is_tty);
} }
if (!strcmp(var, "color.ui")) {
git_use_color_default = git_config_colorbool(var, value, stdout_is_tty);
return 0;
}
return 0; return 0;
} }
@ -267,7 +271,7 @@ static int get_colorbool(int argc, const char **argv)
if (!strcmp(get_color_slot, "color.diff")) if (!strcmp(get_color_slot, "color.diff"))
get_colorbool_found = get_diff_color_found; get_colorbool_found = get_diff_color_found;
if (get_colorbool_found < 0) if (get_colorbool_found < 0)
get_colorbool_found = 0; get_colorbool_found = git_use_color_default;
} }
if (argc == 1) { if (argc == 1) {