X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pager.c;h=ca002f9f791b6cdb8257836be9e13fe648afa1cc;hb=22c430ad8468133fa5ed46d8407d7f4cde2c4a0e;hp=5f280ab52720772905cacbcba522ecc9c81bb529;hpb=610f043bb378d12f399f4e5692fb874e0a043b23;p=git.git

diff --git a/pager.c b/pager.c
index 5f280ab52..ca002f9f7 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)
 {
 	/*
@@ -31,6 +31,11 @@ void setup_pager(void)
 
 	if (!isatty(1))
 		return;
+	if (!pager) {
+		if (!pager_program)
+			git_config(git_default_config);
+		pager = pager_program;
+	}
 	if (!pager)
 		pager = getenv("PAGER");
 	if (!pager)
@@ -38,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;
@@ -52,6 +57,7 @@ void setup_pager(void)
 	/* return in the child */
 	if (!pid) {
 		dup2(fd[1], 1);
+		dup2(fd[1], 2);
 		close(fd[0]);
 		close(fd[1]);
 		return;
@@ -67,3 +73,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;
+}