[PATCH 8/9] builtin: check pager.<cmd> configuration if RUN_SETUP_GENTLY is used
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Apr 13, 2010, 02:30 UTC
- Message-ID
- <20100413023003.GH4118@progeny.tock>
- In-Reply-To
- <20100413021153.GA3978@progeny.tock>
Eventually, all git commands should check their configuration at start-up. For now, reading configuration before repository discovery is dangerous because it could cause a pager.<cmd> setting from the current repository to be neglected.
But for commands with RUN_SETUP or RUN_SETUP_GENTLY set, it is safe.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- git.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git.c b/git.c index 20e9bfc..56e93cf 100644 --- a/git.c +++ b/git.c @@ -251,7 +251,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) prefix = setup_git_directory_gently(&nongit_ok); } - if (use_pager == -1 && p->option & RUN_SETUP) + if (use_pager == -1 && p->option & (RUN_SETUP | RUN_SETUP_GENTLY)) use_pager = check_pager_config(p->cmd); if (use_pager == -1 && p->option & USE_PAGER) use_pager = 1;
-- 1.7.0.4