summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-25 20:43:07 +0200
committerJunio C Hamano <gitster@pobox.com>2014-06-25 20:43:07 +0200
commite293c563b00f9adfff44676d7406d40194aff228 (patch)
tree5bd2a3402eef0d353670037319671188f0a23f13
parentMerge branch 'jc/rev-parse-argh-dashed-multi-words' into maint (diff)
parentpager: do allow spawning pager recursively (diff)
downloadgit-e293c563b00f9adfff44676d7406d40194aff228.tar.xz
git-e293c563b00f9adfff44676d7406d40194aff228.zip
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pager.c b/pager.c
index 0cc75a8eee..53670a63a7 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;
/*