From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] log: if --decorate is not given, default to --decorate=auto
Date: Tue, 21 Mar 2017 10:34:19 -0700 [thread overview]
Message-ID: <xmqqinn2sfdw.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170321055203.26488-1-alexhenrie24@gmail.com> (Alex Henrie's message of "Mon, 20 Mar 2017 23:52:03 -0600")
Alex Henrie <alexhenrie24@gmail.com> writes:
> Git's branching and merging system can be confusing, especially to new
> users. When teaching people Git, I tell them to set log.decorate=auto.
> This preference greatly improves the user's awareness of the local and
> remote branches. So for the sake of user friendliness, I'd like to
> change the default from log.decorate=no to log.decorate=auto.
>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
I guess this is an analog of making color.ui default to "auto" we
did earlier. After having shipped with a more conservative default
while letting willing users experiment/experience to help us get the
kinks out of the "auto" setting, it probably is about time to flip
the default.
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index 48b55bfd2..3aa8daba3 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -520,7 +520,7 @@ test_expect_success 'log --graph with merge' '
> '
>
> 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?
next prev parent reply other threads:[~2017-03-21 18:27 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 [this message]
2017-03-21 22:28 ` Junio C Hamano
2017-03-22 5:47 ` Alex Henrie
2017-03-22 16:54 ` Junio C Hamano
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=xmqqinn2sfdw.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).