Merge branch 'maint'

diff --git a/pager.c b/pager.c
index 5f280ab52720772905cacbcba522ecc9c81bb529..fb7a1a625abf07b0d896a270286ee422a700c14c 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1,7 +1,5 @@
 #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.
@@ -31,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)