Re: [PATCH 8/9] builtin: check pager.<cmd> configuration if RUN_SETUP_GENTLY is used

From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: Apr 13, 2010, 10:12 UTC
Message-ID: <y2yfcaeb9bf1004130312l197983cnf92371acc88464db@mail.gmail.com>
In-Reply-To: <20100413023003.GH4118@progeny.tock>

2010/4/13 Jonathan Nieder <jrnieder@gmail.com>:

Show 13 quoted lines

> 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;

On the second look, there's another case, when RUN_SETUP_GENTLY is set, but no repository is found. git_config() will pick $(cwd)/.git/config if it exists. I guess it's OK for this series because the true fix will require more changes.

-- 
Duy