From 6e9af863ee76423ec8416ad16140ef5f810783bf Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 11 Dec 2007 01:27:33 -0500 Subject: Support GIT_PAGER_IN_USE environment variable When deciding whether or not to turn on automatic color support, git_config_colorbool checks whether stdout is a tty. However, because we run a pager, if stdout is not a tty, we must check whether it is because we started the pager. This used to be done by checking the pager_in_use variable. This variable was set only when the git program being run started the pager; there was no way for an external program running git indicate that it had already started a pager. This patch allows a program to set GIT_PAGER_IN_USE to a true value to indicate that even though stdout is not a tty, it is because a pager is being used. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- color.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'color.c') diff --git a/color.c b/color.c index 7bd424a8f..7f66c29fa 100644 --- a/color.c +++ b/color.c @@ -135,7 +135,7 @@ int git_config_colorbool(const char *var, const char *value, int stdout_is_tty) auto_color: if (stdout_is_tty < 0) stdout_is_tty = isatty(1); - if (stdout_is_tty || (pager_in_use && pager_use_color)) { + if (stdout_is_tty || (pager_in_use() && pager_use_color)) { char *term = getenv("TERM"); if (term && strcmp(term, "dumb")) return 1; -- cgit v1.2.1