X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pager.c;h=975955ba82a0dbb128d6733090cd74c2b509ea81;hb=8f41c07f90da5e314cbc428f1e3e936563f7f39d;hp=dac358f047550a07dd8d90b2e410feab3eebd534;hpb=c7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad;p=git.git diff --git a/pager.c b/pager.c index dac358f04..975955ba8 100644 --- a/pager.c +++ b/pager.c @@ -11,8 +11,6 @@ * something different on Windows. */ -static int spawned_pager; - #ifndef WIN32 static void pager_preexec(void) { @@ -78,7 +76,7 @@ void setup_pager(void) if (!pager) return; - spawned_pager = 1; /* means we are emitting to terminal */ + setenv("GIT_PAGER_IN_USE", "true", 1); /* spawn the pager */ pager_argv[0] = pager; @@ -109,10 +107,6 @@ void setup_pager(void) 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; }