diff options
Diffstat (limited to 'pager.c')
| -rw-r--r-- | pager.c | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -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; @@ -57,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; @@ -72,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; +} |