summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-18 20:57:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-18 20:57:30 (GMT)
commit24735cfc500feb2a8dba9f140080ab3476363d28 (patch)
tree43c1113e21d7165ce8ed877506be688cad6c1989
parent34e98ea56414adc5a582e6368e8ec9c109dbee48 (diff)
parentcaef71a5354ca162cc5a6914a7a643efbc9ae28a (diff)
downloadgit-24735cfc500feb2a8dba9f140080ab3476363d28.zip
git-24735cfc500feb2a8dba9f140080ab3476363d28.tar.gz
git-24735cfc500feb2a8dba9f140080ab3476363d28.tar.bz2
Merge branch 'jc/pager-cat'
* jc/pager-cat: Do not fork PAGER=cat
-rw-r--r--pager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pager.c b/pager.c
index e5ba273..b063353 100644
--- 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)