X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pager.c;h=dcb398da8e703de2999badb976dee7322eff470b;hb=8435a9cb2662ca4326e96ea78d58b9376fb21f7e;hp=2d186e8bde1067a62c9615e8d7f0368f98442ca4;hpb=811476d22480dd444b8eca9834829efce9648637;p=git.git

diff --git a/pager.c b/pager.c
index 2d186e8bd..dcb398da8 100644
--- a/pager.c
+++ b/pager.c
@@ -15,15 +15,19 @@ void setup_pager(void)
 {
 	pid_t pid;
 	int fd[2];
-	const char *pager = getenv("PAGER");
+	const char *pager = getenv("GIT_PAGER");
 
 	if (!isatty(1))
 		return;
+	if (!pager)
+		pager = getenv("PAGER");
 	if (!pager)
 		pager = "less";
 	else if (!*pager || !strcmp(pager, "cat"))
 		return;
 
+	pager_in_use = 1; /* means we are emitting to terminal */
+
 	if (pipe(fd) < 0)
 		return;
 	pid = fork();