From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: Git mailing list <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] builtin/log: honor log.decorate
Date: Fri, 12 May 2017 22:07:04 +0000 [thread overview]
Message-ID: <20170512220704.txmdk45s66aqhexi@genre.crustytoothpaste.net> (raw)
In-Reply-To: <CAMMLpeTYvK+yow8R83Yf-kOFOZngFEfYsoQeXuTOL0tZOE3XTA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 868 bytes --]
next prev parent reply other threads:[~2017-05-12 22:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-12 21:34 [PATCH] builtin/log: honor log.decorate brian m. carlson
2017-05-12 22:03 ` Alex Henrie
2017-05-12 22:07 ` brian m. carlson [this message]
2017-05-12 22:12 ` [PATCH v2] " brian m. carlson
2017-05-12 22:22 ` Alex Henrie
2017-05-12 23:32 ` Jonathan Nieder
2017-05-12 23:37 ` brian m. carlson
2017-05-12 23:48 ` Jonathan Nieder
2017-05-13 1:23 ` Alex Henrie
2017-05-13 2:49 ` brian m. carlson
2017-05-13 2:41 ` brian m. carlson
2017-05-14 18:00 ` [PATCH v3] " brian m. carlson
2017-05-15 2:35 ` Junio C Hamano
2017-05-15 3:48 ` Alex Henrie
2017-05-15 16:26 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170512220704.txmdk45s66aqhexi@genre.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).