Merge branch 'jc/pager-cat'
authorJunio C Hamano <junkio@cox.net>
Tue, 18 Apr 2006 20:57:22 +0000 (13:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 18 Apr 2006 20:57:30 +0000 (13:57 -0700)
* jc/pager-cat:
  Do not fork PAGER=cat

pager.c

diff --git a/pager.c b/pager.c
index e5ba273..b063353 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -20,7 +20,7 @@ void setup_pager(void)
                return;
        if (!pager)
                pager = "less";
-       else if (!*pager)
+       else if (!*pager || !strcmp(pager, "cat"))
                return;
 
        if (pipe(fd) < 0)