Web lists-archives.com

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




On Fri, May 12, 2017 at 04:03:04PM -0600, Alex Henrie wrote:
> > diff --git a/builtin/log.c b/builtin/log.c
> > index b3b10cc1e..304923836 100644
> > --- a/builtin/log.c
> > +++ b/builtin/log.c
> > @@ -34,7 +34,7 @@ static int default_abbrev_commit;
> >  static int default_show_root = 1;
> >  static int default_follow;
> >  static int default_show_signature;
> > -static int decoration_style;
> > +static int decoration_style = -1;
> >  static int decoration_given;
> >  static int use_mailmap_config;
> >  static const char *fmt_patch_subject_prefix = "PATCH";
> > @@ -410,7 +410,7 @@ 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 {
> > +       } else if (decoration_style == -1) {
> >                 decoration_style = auto_decoration_style();
> >         }
> >         if (!strcmp(var, "log.showroot")) {
> 
> Sorry for the mistake. On second thought, I think we should set
> decoration_style = auto_decoration_style() in init_log_defaults.

I can do that.  Patch forthcoming shortly.
-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204

Attachment: signature.asc
Description: PGP signature