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
maint
Junio C Hamano 2014-06-25 11:43:07 -07:00
commit e293c563b0
1 changed files with 1 additions and 1 deletions

View File

@ -64,7 +64,7 @@ void setup_pager(void)
{
const char *pager = git_pager(isatty(1));

if (!pager || pager_in_use())
if (!pager)
return;

/*