From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:16:59 +0000 (-0700)
Subject: Merge branch 'je/pager-do-not-recurse'
X-Git-Tag: v2.1.0-rc0~176
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/db6fbe377075438f494dc2287b23c6e5a7437499?ds=sidebyside;hp=-c

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
---

db6fbe377075438f494dc2287b23c6e5a7437499
diff --combined pager.c
index f75e8aece0,53670a63a7..8b5cbc56e4
--- a/pager.c
+++ b/pager.c
@@@ -64,7 -64,7 +64,7 @@@ void setup_pager(void
  {
  	const char *pager = git_pager(isatty(1));
  
- 	if (!pager || pager_in_use())
+ 	if (!pager)
  		return;
  
  	/*
@@@ -85,7 -85,7 +85,7 @@@
  		int i = 0;
  
  		if (!getenv("LESS"))
 -			env[i++] = "LESS=FRSX";
 +			env[i++] = "LESS=FRX";
  		if (!getenv("LV"))
  			env[i++] = "LV=-c";
  		env[i] = NULL;