git-am: Don't accept an mbox on stdin of we already have a .dotest directory

diff --git a/pager.c b/pager.c
index 9a30939016620072f319b5fef81d0c913513a641..280f57f796c84d1c1fd54e295b542c3b33490b3e 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -24,6 +24,8 @@ void setup_pager(void)
        else if (!*pager || !strcmp(pager, "cat"))
                return;
 
+       pager_in_use = 1; /* means we are emitting to terminal */
+
        if (pipe(fd) < 0)
                return;
        pid = fork();
@@ -46,7 +48,7 @@ void setup_pager(void)
        close(fd[0]);
        close(fd[1]);
 
-       setenv("LESS", "-S", 0);
+       setenv("LESS", "-RS", 0);
        run_pager(pager);
        die("unable to execute pager '%s'", pager);
        exit(255);