Web lists-archives.com

Re: [PATCH v2] builtin/log: honor log.decorate




2017-05-12 16:12 GMT-06:00 brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx>:
> The recent change that introduced autodecorating of refs accidentally
> broke the ability of users to set log.decorate = false to override it.
> When the git_log_config was traversed a second time with an option other
> than log.decorate, the decoration style would be set to the automatic
> style, even if the user had already overridden it.  Instead of setting
> the option in config parsing, set it in init_log_defaults instead.
>
> Signed-off-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx>
> ---
>  builtin/log.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index b3b10cc1e..ec3258368 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -110,6 +110,8 @@ static void init_log_defaults(void)
>  {
>         init_grep_defaults();
>         init_diff_ui_defaults();
> +
> +       decoration_style = auto_decoration_style();
>  }
>
>  static void cmd_log_init_defaults(struct rev_info *rev)
> @@ -410,8 +412,6 @@ static int git_log_config(const char *var, const char *value, void *cb)
>                 if (decoration_style < 0)
>                         decoration_style = 0; /* maybe warn? */
>                 return 0;
> -       } else {
> -               decoration_style = auto_decoration_style();
>         }
>         if (!strcmp(var, "log.showroot")) {
>                 default_show_root = git_config_bool(var, value);

Signed-off-by: Alex Henrie <alexhenrie24@xxxxxxxxx>