diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:43:07 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:43:07 -0700 |
commit | e293c563b00f9adfff44676d7406d40194aff228 (patch) | |
tree | 5bd2a3402eef0d353670037319671188f0a23f13 | |
parent | 9a597edc831038b8c449bd3e527ca2976e4e55a6 (diff) | |
parent | c0459ca4dc47edf5d63850a34a5f67febd966f3d (diff) | |
download | git-e293c563b00f9adfff44676d7406d40194aff228.tar.gz git-e293c563b00f9adfff44676d7406d40194aff228.tar.xz |
Merge branch 'je/pager-do-not-recurse' into maint
We used to unconditionally disable the pager in the pager process
we spawn to feed out output, but that prevented people who want to
run "less" within "less" from doing so.
* je/pager-do-not-recurse:
pager: do allow spawning pager recursively
-rw-r--r-- | pager.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -64,7 +64,7 @@ void setup_pager(void) { const char *pager = git_pager(isatty(1)); - if (!pager || pager_in_use()) + if (!pager) return; /* |