@matheusbsbs / matheus-bagliano / commits / cad3a2056d
Fork 0

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>

Junio C Hamano committed Aug 6, 2007 at 21:08 UTC cad3a2056d2aef3f57c3bb0eccc10614ae69926f
1 file changed +4 -1
pager.c
+4 -1
@@ -31,8 +31,11 @@ void setup_pager(void)
31
32 if (!isatty(1))
33 return;
34 - if (!pager)
34 + if (!pager) {
35 + if (!pager_program)
36 + git_config(git_default_config);
37 pager = pager_program;
38 + }
39 if (!pager)
40 pager = getenv("PAGER");
41 if (!pager)