diff options
| author | Matthias Kestenholz <mk@spinlock.ch> | 2008-04-09 21:32:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-10 12:40:50 -0700 |
| commit | 4d4f5ba3ea9d22137f86f1d8e574a667e76e45bf (patch) | |
| tree | 99e9ad23dc5b36bea9af048d46336614b740c55d | |
| parent | 71349732c53a4c1b64729628b04db7b3c3f7606d (diff) | |
| download | git-4d4f5ba3ea9d22137f86f1d8e574a667e76e45bf.tar.gz | |
Use color.ui variable in scripts too
Signed-off-by: Matthias Kestenholz <mk@spinlock.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-config.txt | 2 | ||||
| -rw-r--r-- | builtin-config.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index fa161718dd..5de5d051b7 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -144,6 +144,8 @@ See also <<FILES>>. "auto". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color 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:: diff --git a/builtin-config.c b/builtin-config.c index c34bc8b6a6..eccb7e7764 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -224,6 +224,10 @@ static int git_get_colorbool_config(const char *var, const char *value) get_diff_color_found = 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; } @@ -251,7 +255,7 @@ static int get_colorbool(int argc, const char **argv) if (!strcmp(get_color_slot, "color.diff")) get_colorbool_found = get_diff_color_found; if (get_colorbool_found < 0) - get_colorbool_found = 0; + get_colorbool_found = git_use_color_default; } if (argc == 1) { |