diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:42:15 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:42:16 -0700 |
commit | d5ca1ab395d4994346e13569ad7a7f5cd4acfade (patch) | |
tree | 10743431679e061c5c37d2a427de6c864e52b13b | |
parent | Merge branch 'fc/t3200-fixes' (diff) | |
parent | pager: turn on "cat" optimization for DEFAULT_PAGER (diff) | |
download | tgif-d5ca1ab395d4994346e13569ad7a7f5cd4acfade.tar.xz |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |