git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / Atom feed
From: Ariadne Conill <ariadne@dereferenced.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	git-for-windows@googlegroups.com,
	Git Mailing List <git@vger.kernel.org>,
	git-packagers@googlegroups.com
Subject: Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0
Date: Thu, 1 Aug 2019 11:12:02 -0500
Message-ID: <CAAOiGNzYUmC+Ns_CiVm-BL06=Sd5ZYuxEgnQK-04BUAwJAqWCQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqlfwcopn1.fsf@gitster-ct.c.googlers.com>

Hello,

On Thu, Aug 1, 2019 at 10:46 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
> > Although as Dscho mentions, it's particularly irritating because it is
> > not part of the paginated output.
> > ...
> > Let's bite the bullet and jump straight to --use-mailmap in case (4).
> >
> > While at it, add a new log.mailmap setting "auto" that can be used to
> > explicitly request the new automatic behavior (so that e.g. if
> > log.mailmap is set to "true" system-side, I can set it to "auto" in my
> > per-user configuration).
>
> While I think "revert to hardcoded default" may be a good idea, I do
> not think the hardcoded default you implemented that changes the
> behaviour based on the output destination makes much sense.  If I
> want to eradicate junkio@cox.net from my paged/interactive output, I
> want to eradicate it also in the output piped to the script I use
> for authorship stats.
>
> I suspect that you may have misread the "is interactive" bit in the
> original; that was used only to decide if we are going to warn.
>
> Anyway, how about this much simplified version?

It looks good to me.

Acked-by: Ariadne Conill <ariadne@dereferenced.org>

>
> -- >8 --
> From: Junio C Hamano <gitster@pobox.com>
> Date: Thu, 1 Aug 2019 08:32:44 -0700
> Subject: [PATCH] log: flip the --mailmap default unconditionally
>
> It turns out that being cautious to warn against upcoming default
> change was an unpopular behaviour, and such a care can easily be
> defeated by distro packagers to render it ineffective anyway.
>
> Just flip the default, with only a mention in the release notes.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  Documentation/RelNotes/2.23.0.txt |  8 +++-----
>  builtin/log.c                     | 16 +---------------
>  t/t7006-pager.sh                  |  2 --
>  3 files changed, 4 insertions(+), 22 deletions(-)
>
> diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
> index 19e894a44e..6ef8f21b56 100644
> --- a/Documentation/RelNotes/2.23.0.txt
> +++ b/Documentation/RelNotes/2.23.0.txt
> @@ -10,6 +10,9 @@ Backward compatibility note
>     prerequisite patches in an unstable way, which has been updated to
>     compute in a way that is compatible with "git patch-id --stable".
>
> + * The "git log" command by default behaves as if the --mailmap option
> +   was given.
> +
>
>  UI, Workflows & Features
>
> @@ -91,11 +94,6 @@ UI, Workflows & Features
>     commit-graph files now, which allows the commit-graph files to be
>     updated incrementally.
>
> - * The "git log" command learns to issue a warning when log.mailmap
> -   configuration is not set and --[no-]mailmap option is not used, to
> -   prepare users for future versions of Git that uses the mailmap by
> -   default.
> -
>   * "git range-diff" output has been tweaked for easier identification
>     of which part of what file the patch shown is about.
>
> diff --git a/builtin/log.c b/builtin/log.c
> index 1cf9e37736..40b4cbf57d 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -156,16 +156,6 @@ static void cmd_log_init_defaults(struct rev_info *rev)
>                 parse_date_format(default_date_mode, &rev->date_mode);
>  }
>
> -static char warn_unspecified_mailmap_msg[] =
> -N_("log.mailmap is not set; its implicit value will change in an\n"
> -   "upcoming release. To squelch this message and preserve current\n"
> -   "behaviour, set the log.mailmap configuration value to false.\n"
> -   "\n"
> -   "To squelch this message and adopt the new behaviour now, set the\n"
> -   "log.mailmap configuration value to true.\n"
> -   "\n"
> -   "See 'git help config' and search for 'log.mailmap' for further information.");
> -
>  static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>                          struct rev_info *rev, struct setup_revision_opt *opt)
>  {
> @@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>         memset(&w, 0, sizeof(w));
>         userformat_find_requirements(NULL, &w);
>
> -       if (mailmap < 0) {
> -               if (session_is_interactive() && !rev->pretty_given)
> -                       warning("%s\n", _(warn_unspecified_mailmap_msg));
> -
> +       if (mailmap < 0)
>                 mailmap = 0;
> -       }
>
>         if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
>                 rev->show_notes = 1;
> diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
> index 7976fa7bcc..00e09a375c 100755
> --- a/t/t7006-pager.sh
> +++ b/t/t7006-pager.sh
> @@ -7,8 +7,6 @@ test_description='Test automatic use of a pager.'
>  . "$TEST_DIRECTORY"/lib-terminal.sh
>
>  test_expect_success 'setup' '
> -       : squelch advice messages during the transition &&
> -       git config --global log.mailmap false &&
>         sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
>         test_unconfig core.pager &&
>
> --
> 2.23.0-rc0-144-gce799e40b3
>
>
>

  reply	other threads:[~2019-08-01 16:12 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-29 21:49 Junio C Hamano
2019-07-31 12:43 ` Git for Windows v2.23.0-rc0, was " Johannes Schindelin
2019-07-31 23:18   ` Jeff King
2019-08-01  0:21     ` Jonathan Nieder
2019-08-01  0:37       ` Ariadne Conill
2019-08-01  1:00       ` Jeff King
2019-08-01  1:14         ` Jonathan Nieder
2019-08-01  1:38         ` Ariadne Conill
2019-08-01  2:53           ` Jeff King
2019-08-01  3:21         ` Junio C Hamano
2019-08-01  4:54           ` Ariadne Conill
2019-08-01 21:39             ` Johannes Schindelin
2019-08-01 15:45       ` Junio C Hamano
2019-08-01 16:12         ` Ariadne Conill [this message]
2019-08-01 21:36         ` Jeff King
2019-08-01 21:46           ` Junio C Hamano
2019-08-01 21:54             ` Junio C Hamano
2019-08-01 22:18               ` Todd Zullinger
2019-08-02  2:27         ` Jonathan Nieder
2019-08-02 16:53           ` Junio C Hamano
2019-08-02 18:35             ` Jeff King
2019-08-01  1:04   ` [git-for-windows] " Bryan Turner
2019-08-01 21:40     ` Johannes Schindelin
2019-08-01 14:12 ` [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues Martin Ågren
2019-08-01 15:56   ` Junio C Hamano
2019-08-01 15:57   ` Junio C Hamano
2019-08-01 19:28     ` Martin Ågren

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='CAAOiGNzYUmC+Ns_CiVm-BL06=Sd5ZYuxEgnQK-04BUAwJAqWCQ@mail.gmail.com' \
    --to=ariadne@dereferenced.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git-for-windows@googlegroups.com \
    --cc=git-packagers@googlegroups.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.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

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for the project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git