summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-18 11:42:15 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-18 11:42:16 -0700
commitd5ca1ab395d4994346e13569ad7a7f5cd4acfade (patch)
tree10743431679e061c5c37d2a427de6c864e52b13b
parent18fe5003485dd47081c5bdc626dd8697845ee81e (diff)
parented016612e6956496d5028e41f6414be29c09be4e (diff)
downloadgit-d5ca1ab395d4994346e13569ad7a7f5cd4acfade.tar.gz
Merge branch 'jk/pager-bypass-cat-for-default-pager'
If a build-time fallback is set to "cat" instead of "less", we should apply the same "no subprocess or pipe" optimization as we apply to user-supplied GIT_PAGER=cat. * jk/pager-bypass-cat-for-default-pager: pager: turn on "cat" optimization for DEFAULT_PAGER
-rw-r--r--pager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pager.c b/pager.c
index c1ecf657fd..fa19765eb9 100644
--- a/pager.c
+++ b/pager.c
@@ -54,7 +54,7 @@ const char *git_pager(int stdout_is_tty)
pager = getenv("PAGER");
if (!pager)
pager = DEFAULT_PAGER;
- else if (!*pager || !strcmp(pager, "cat"))
+ if (!*pager || !strcmp(pager, "cat"))
pager = NULL;
return pager;