Merge branch 'master' of git://repo.or.cz/git/fastimport

[git.git] / pager.c

diff --git a/pager.c b/pager.c
index 4587fbbdb51e50c1e3e6e4c3476cdccd4ac59cee..3bfed025996bbdc31aebd4a7b096236c538a4e75 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1,5 +1,7 @@
 #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.
@@ -7,6 +9,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 +31,8 @@ void setup_pager(void)
 
        if (!isatty(1))
                return;
+       if (!pager)
+               pager = pager_program;
        if (!pager)
                pager = getenv("PAGER");
        if (!pager)