summaryrefslogtreecommitdiff
path: root/pager.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 11:16:59 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-06 11:17:00 -0700
commitdb6fbe377075438f494dc2287b23c6e5a7437499 (patch)
tree237c800b5541618db131ad4d4015e71b0ca2d03d /pager.c
parente88155d1e1c3b55ed1f78425b0c2e5a09eea29dd (diff)
parentc0459ca4dc47edf5d63850a34a5f67febd966f3d (diff)
downloadgit-db6fbe377075438f494dc2287b23c6e5a7437499.tar.gz
Merge branch 'je/pager-do-not-recurse'
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
Diffstat (limited to 'pager.c')
-rw-r--r--pager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pager.c b/pager.c
index f75e8aece0..8b5cbc56e4 100644
--- a/pager.c
+++ b/pager.c
@@ -64,7 +64,7 @@ void setup_pager(void)
{
const char *pager = git_pager(isatty(1));
- if (!pager || pager_in_use())
+ if (!pager)
return;
/*