X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=color.c;h=7f66c29fae57abceda30b1257c2a66626f3be0b2;hb=7ee906694c28ab7281492d5114d2afabd964bd41;hp=97cfbda31ac02b7e4fe747052c28821a34ee0165;hpb=ab7d70766963e1e854a1edcbb0b840242330a7cb;p=git.git

diff --git a/color.c b/color.c
index 97cfbda31..7f66c29fa 100644
--- a/color.c
+++ b/color.c
@@ -116,7 +116,7 @@ bad:
 	die("bad config value '%s' for variable '%s'", value, var);
 }
 
-int git_config_colorbool(const char *var, const char *value)
+int git_config_colorbool(const char *var, const char *value, int stdout_is_tty)
 {
 	if (value) {
 		if (!strcasecmp(value, "never"))
@@ -133,7 +133,9 @@ int git_config_colorbool(const char *var, const char *value)
 
 	/* any normal truth value defaults to 'auto' */
  auto_color:
-	if (isatty(1) || (pager_in_use && pager_use_color)) {
+	if (stdout_is_tty < 0)
+		stdout_is_tty = isatty(1);
+	if (stdout_is_tty || (pager_in_use() && pager_use_color)) {
 		char *term = getenv("TERM");
 		if (term && strcmp(term, "dumb"))
 			return 1;