From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Aug 2007 04:08:43 +0000 (-0700)
Subject: pager: find out pager setting from configuration
X-Git-Tag: v1.5.3-rc5~62
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cad3a2056d2aef3f57c3bb0eccc10614ae69926f;p=git.git

pager: find out pager setting from configuration

It was very unfortunate that we added core.pager setting to the
configuration file; even when the underlying command does not care
if there is no git repository is involved (think "git diff --no-index"),
the user would now rightfully want the configuration setting to be
honored, which means we would need to read the configuration file before
we launch the pager.

This is a minimum change in the sense that it restores the old
behaviour of not even reading config in setup_git_directory(),
but have the core.pager honored when we know it matters.

Note that this does not cover "git -p --git-dir where command";
the -p option immediately trigger the pager settings before we
even see --git-dir to learn where the configuration file is, so
we will end up reading the configuration from the place where
we would _normally_ find the git repository.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/pager.c b/pager.c
index 3bfed0259..8bac9d990 100644
--- a/pager.c
+++ b/pager.c
@@ -31,8 +31,11 @@ void setup_pager(void)
 
 	if (!isatty(1))
 		return;
-	if (!pager)
+	if (!pager) {
+		if (!pager_program)
+			git_config(git_default_config);
 		pager = pager_program;
+	}
 	if (!pager)
 		pager = getenv("PAGER");
 	if (!pager)