Merge branch 'je/pager-do-not-recurse'

We used to unconditionally disable the pager in the pager process
we spawn to feed out output, but that prevented people who want to
run "less" within "less" from doing so.

* je/pager-do-not-recurse:
pager: do allow spawning pager recursively

diff --combined pager.c
index f75e8aece0d4273afd994e2b3eca70a02fa2d8c9,53670a63a7ae4dc3a9199671fe899c31251a916c..8b5cbc56e4fd57a1b9d2cad3e668df4c508a7b17
--- 1/pager.c
--- 2/pager.c
+++ b/pager.c
@@@ -64,7 -64,7 +64,7 @@@ void setup_pager(void
  {
        const char *pager = git_pager(isatty(1));
  
-       if (!pager || pager_in_use())
+       if (!pager)
                return;
  
        /*
@@@ -85,7 -85,7 +85,7 @@@
                int i = 0;
  
                if (!getenv("LESS"))
 -                      env[i++] = "LESS=FRSX";
 +                      env[i++] = "LESS=FRX";
                if (!getenv("LV"))
                        env[i++] = "LV=-c";
                env[i] = NULL;