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
This commit is contained in:
Junio C Hamano 2014-06-06 11:16:59 -07:00
commit db6fbe3770

View File

@ -64,7 +64,7 @@ void setup_pager(void)
{ {
const char *pager = git_pager(isatty(1)); const char *pager = git_pager(isatty(1));
if (!pager || pager_in_use()) if (!pager)
return; return;
/* /*