From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Fri, 13 Apr 2012 10:54:34 +0000 (+0700)
Subject: Stop starting pager recursively
X-Git-Tag: v1.7.11-rc0~60^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88e8f908f2b0c56f9ccf8134d8ff9f689af9cc84;p=git.git

Stop starting pager recursively

git-column can be used as a pager for other git commands, something
like this:

    GIT_PAGER="git -p column --mode='dense color'" git -p branch

The problem with this is that "git -p column" also has $GIT_PAGER set so
the pager runs itself again as another pager. The end result is an
infinite loop of forking. Other git commands have the same problem if
being abused this way.

Check if $GIT_PAGER is already set and stop launching another pager.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/pager.c b/pager.c
index 05584dead..4dcb08d96 100644
--- a/pager.c
+++ b/pager.c
@@ -73,7 +73,7 @@ void setup_pager(void)
 {
 	const char *pager = git_pager(isatty(1));
 
-	if (!pager)
+	if (!pager || pager_in_use())
 		return;
 
 	/*