From cad3a2056d2aef3f57c3bb0eccc10614ae69926f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 6 Aug 2007 21:08:43 -0700 Subject: [PATCH] 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 --- pager.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) -- 2.11.4.GIT