From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: Git mailing list <git@vger.kernel.org>
Subject: Re: [PATCH] log: if --decorate is not given, default to --decorate=auto
Date: Wed, 22 Mar 2017 09:54:32 -0700 [thread overview]
Message-ID: <xmqqmvcdmeuv.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAMMLpeQZXzPtN+mmtRS33vbT6hFz8p0qqjFMhz9tUHk747=Z3Q@mail.gmail.com> (Alex Henrie's message of "Tue, 21 Mar 2017 23:47:23 -0600")
Alex Henrie <alexhenrie24@gmail.com> writes:
> 2017-03-21 16:28 GMT-06:00 Junio C Hamano <gitster@pobox.com>:
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>>> test_expect_success 'log.decorate configuration' '
>>>> - git log --oneline >expect.none &&
>>>> + git log --oneline --no-decorate >expect.none &&
>>>> git log --oneline --decorate >expect.short &&
>>>> git log --oneline --decorate=full >expect.full &&
>>>
>>> This ensures that an explicit --no-decorate from the command line
>>> does give "none" output, which we failed to do so far, and is a good
>>> change. Don't we also need a _new_ test to ensure that "auto" kicks
>>> in without any explicit request? Knowing the implementation that
>>> pager-in-use triggers the "auto" behaviour, perhaps testing the
>>> output from "git -p log" would be sufficient?
>>
>> BTW,
>>
>>>
>>> +static int auto_decoration_style()
>>> +{
>>> + return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
>>> +}
>>
>> FYI, I fixed this to
>>
>> static int auto_decoration_style(void)
>>
>> while queuing to make it compile.
>
> No problem. Do I need to submit a second version of the patch with a
> test for `git -p log`?
You do want to protect this "without an option, we default to
'auto'" feature from future breakage, no?
Thanks.
next prev parent reply other threads:[~2017-03-22 17:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 5:52 [PATCH] log: if --decorate is not given, default to --decorate=auto Alex Henrie
2017-03-21 17:34 ` Junio C Hamano
2017-03-21 22:28 ` Junio C Hamano
2017-03-22 5:47 ` Alex Henrie
2017-03-22 16:54 ` Junio C Hamano [this message]
2017-03-23 15:07 ` Alex Henrie
2017-03-23 15:54 ` Junio C Hamano
2017-03-23 16:52 ` Alex Henrie
2017-03-23 18:03 ` Junio C Hamano
2017-03-24 5:45 ` Alex Henrie
2017-03-24 18:55 ` Jeff King
2017-03-24 18:59 ` [PATCH] pager_in_use: use git_env_bool() Jeff King
2017-03-24 19:13 ` [PATCH] log: if --decorate is not given, default to --decorate=auto Junio C Hamano
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=xmqqmvcdmeuv.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
/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).