git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
	git@vger.kernel.org, Alex Henrie <alexhenrie24@gmail.com>
Subject: Re: [PATCH v3] builtin/log: honor log.decorate
Date: Mon, 15 May 2017 09:26:35 -0700	[thread overview]
Message-ID: <20170515162635.GI27400@aiede.svl.corp.google.com> (raw)
In-Reply-To: <xmqqy3tyx2x5.fsf@gitster.mtv.corp.google.com>

Junio C Hamano wrote:
> "brian m. carlson" <sandals@crustytoothpaste.net> writes:

>> 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.
>>
>> Add a test for this case.  The actual additional config option doesn't
>> matter, but it needs to be something not already set in the
>> configuration file.
>>
>> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
>> ---
>> Changes from v2:
>> * Add a test.  I tested that the config parsing both works with
>>   additional options and also can be overridden from the command line.
>
> Thanks, all.
>
> Will queue with Acked-by by Alex and Reviewed-by by Jonathan.

For completeness: yeah, this version is Reviewed-by: me.  Thanks, all.

      parent reply	other threads:[~2017-05-15 16:26 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
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 [this message]

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=20170515162635.GI27400@aiede.svl.corp.google.com \
    --to=jrnieder@gmail.com \
    --cc=alexhenrie24@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sandals@crustytoothpaste.net \
    /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).