From: Matthias Lederhofer <matled@gmx.net>
Date: Mon, 31 Jul 2006 13:27:00 +0000 (+0200)
Subject: pager: environment variable GIT_PAGER to override PAGER
X-Git-Tag: v1.4.3-rc1~279^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c27d205aaefb654c12a4ab9e0b4fae1882c0fc70;p=git.git

pager: environment variable GIT_PAGER to override PAGER

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7310a2b8b..d24388368 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -627,6 +627,9 @@ git Diffs
 
 other
 ~~~~~
+'GIT_PAGER'::
+	This environment variable overrides `$PAGER`.
+
 'GIT_TRACE'::
 	If this variable is set git will print `trace:` messages on
 	stderr telling about alias expansion, built-in command
diff --git a/pager.c b/pager.c
index 280f57f79..dcb398da8 100644
--- a/pager.c
+++ b/pager.c
@@ -15,10 +15,12 @@ void setup_pager(void)
 {
 	pid_t pid;
 	int fd[2];
-	const char *pager = getenv("PAGER");
+	const char *pager = getenv("GIT_PAGER");
 
 	if (!isatty(1))
 		return;
+	if (!pager)
+		pager = getenv("PAGER");
 	if (!pager)
 		pager = "less";
 	else if (!*pager || !strcmp(pager, "cat"))