git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Junio C Hamano <gitster@pobox.com>,
	git-for-windows@googlegroups.com, git@vger.kernel.org,
	git-packagers@googlegroups.com,
	Ariadne Conill <ariadne@dereferenced.org>
Subject: Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0
Date: Wed, 31 Jul 2019 21:00:23 -0400	[thread overview]
Message-ID: <20190801010022.GA6553@sigill.intra.peff.net> (raw)
In-Reply-To: <20190801002125.GA176307@google.com>

On Wed, Jul 31, 2019 at 05:21:25PM -0700, Jonathan Nieder wrote:

> Although as Dscho mentions, it's particularly irritating because it is
> not part of the paginated output.
> 
> I wonder if the ideal might not be to trigger it more selectively, when
> the output actually changed due to a reflog entry.  I mean something
> like
> 
> 	commit 393a9dd0f9762c69f753a8fa0bc89c203c6b4e9e (HEAD, origin/foo, other/pu)
> 	Merge: 18598e40e6 1eba6eb1c2
> 	Author: A U Thor <author@example.com> (see "git help mailmap")
> 	Date:   Tue Jul 30 15:05:41 2019 -0700
> 
> 	    Merge branch 'jt/fetch-cdn-offload' into foo

I actually kind of like that, because it tells you exactly when it is
impacting things (not just that the mailmap was used, but that this
_particular_ name was mapped, which is going to be the most actionable
thing). But I do think the syntax above might end up breaking somebody
who's trying to parse it (people aren't supposed to be parsing log
output, but...).

Something like:

  Author: A U Thor <author@example.com>
  Original-Author: I M Mailmapped <orig@example.com>

gives even more information while leaving the "Author:" line untouched.
But in introducing a new line, it may also be breaking somebody.

I think all of these are riskier than just quietly engaging the mailmap.
That's syntactically identical, so no risk of parsing regressions That's
almost always going to be what people _actually_ want if there's a
mailmap in the repo. The only exception is if they're somehow trying to
do analysis on original versus mapped names. At which point they really
ought to be using a parseable format like --pretty=raw, or "%an <%ae>".

> is *particularly* unactionable in the current state where we're not
> rewriting authors.  I think we should bite the bullet and just flip
> the default to "true", with the config as an escape hatch to allow
> going back to the old behavior.
> 
> Is it too late in the release cycle to do that?  If not, we can do

IMHO no, it is not too late. This is a new feature in this release, and
we're at -rc0. The point of the rc period is to find problems in the new
code. So certainly I think it is not too late to change our minds about
this feature. I could see an argument that instead of changing it now,
we should revert for v2.23 and work on it with less urgency during the
next cycle. But personally I'd see what a day or two of discussion turns
up; if everybody agrees on the path forward and the implementation isn't
complicated, it may be easiest to just proceed now.

> -- >8 --
> Subject: log: use mailmap by default in interactive use

This seems OK to me, though I kind of wonder if anybody really wants
"auto". Unlike log.decorate, which changes the syntax, there is no real
reason to avoid mailmap when somebody else is parsing the output. And I
could imagine it is especially confusing if:

  git log --author=whoever

and

  git log | grep whoever | wc -l

do not agree.

-Peff

  parent reply	other threads:[~2019-08-01  1:00 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 [this message]
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
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=20190801010022.GA6553@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=ariadne@dereferenced.org \
    --cc=git-for-windows@googlegroups.com \
    --cc=git-packagers@googlegroups.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --subject='Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0' \
    /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://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.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 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