X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pager.c;h=0376953cb1b8a4095346e0d12ecef6e7db9c48c9;hb=95f9b92700585eb9afa6978c350dc07ec5769ec6;hp=8bac9d990381f5664333a92f68b0b8cd97d43855;hpb=d794d9e70ebb8c767b04f25c03290ef305cd31ab;p=git.git

diff --git a/pager.c b/pager.c
index 8bac9d990..0376953cb 100644
--- a/pager.c
+++ b/pager.c
@@ -1,12 +1,12 @@
 #include "cache.h"
 
-#include <sys/select.h>
-
 /*
  * This is split up from the rest of git so that we might do
  * something different on Windows, for example.
  */
 
+static int spawned_pager;
+
 static void run_pager(const char *pager)
 {
 	/*
@@ -43,7 +43,7 @@ void setup_pager(void)
 	else if (!*pager || !strcmp(pager, "cat"))
 		return;
 
-	pager_in_use = 1; /* means we are emitting to terminal */
+	spawned_pager = 1; /* means we are emitting to terminal */
 
 	if (pipe(fd) < 0)
 		return;
@@ -72,3 +72,14 @@ void setup_pager(void)
 	die("unable to execute pager '%s'", pager);
 	exit(255);
 }
+
+int pager_in_use(void)
+{
+	const char *env;
+
+	if (spawned_pager)
+		return 1;
+
+	env = getenv("GIT_PAGER_IN_USE");
+	return env ? git_config_bool("GIT_PAGER_IN_USE", env) : 0;
+}