Merge branch 'maint'

diff --git a/pager.c b/pager.c
index dcb398da8e703de2999badb976dee7322eff470b..fb7a1a625abf07b0d896a270286ee422a700c14c 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -7,6 +7,16 @@
 
 static void run_pager(const char *pager)
 {
+       /*
+        * Work around bug in "less" by not starting it until we
+        * have real input
+        */
+       fd_set in;
+
+       FD_ZERO(&in);
+       FD_SET(0, &in);
+       select(1, &in, NULL, &in, NULL);
+
        execlp(pager, pager, NULL);
        execl("/bin/sh", "sh", "-c", pager, NULL);
 }
@@ -19,6 +29,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)
@@ -50,7 +65,7 @@ void setup_pager(void)
        close(fd[0]);
        close(fd[1]);
 
-       setenv("LESS", "-RS", 0);
+       setenv("LESS", "FRSX", 0);
        run_pager(pager);
        die("unable to execute pager '%s'", pager);
        exit(255);