Skip to content

Commit e293c56

Browse files
committed
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
2 parents 9a597ed + c0459ca commit e293c56

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

pager.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void setup_pager(void)
6464
{
6565
const char *pager = git_pager(isatty(1));
6666

67-
if (!pager || pager_in_use())
67+
if (!pager)
6868
return;
6969

7070
/*

0 commit comments

Comments
 (0)