git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org
Subject: Re: [PATCH 1/1] Update .mailmap
Date: Fri, 9 Nov 2018 12:29:28 +0100 (STD)	[thread overview]
Message-ID: <nycvar.QRO.7.76.6.1811091216490.39@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqq5zx76k67.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Fri, 9 Nov 2018, Junio C Hamano wrote:

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
> 
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > This patch makes the output of `git shortlog -nse v2.10.0`
> > duplicate-free.
> 
> Did you mean "v2.10.0..master" or did you really mean this covers
> authors recorded up to v2.10.0?  Judging from the cover letter, I
> think you meant the former.

D'oh. Yes, I meant v2.10.0..master.

> Can you say a bit more about how one among multiple addresses for
> each person was chosen in the log message?  E.g. "After asking each
> author which one is the preferred one", "Picked the one with the
> most recent committer timestamps", "There were two for each but one
> of them were bouncing", etc.

I looked at each of the authors' mails and tried to determine which one
was the preferred one. For example, Masaya sent a patch from their gmail
account but signed off using their google account, so I figured the latter
was preferable. Nicolas, on the other hand, already had a couple of
entries in .mailmap, so I picked the one that seemed to be preferred
judging by the .mailmap even if it was not in use lately.

For Christian, it was gmail vs googlemail, and I picked the former, as it
is more common these days.

For Ben and Stolee, I used their Microsoft accounts (preferring the one
Ben used originally).

For Joachim, Matthieu, Randall and Tao, I used the more personalized email
address.

For Orgad, I used his personal one rather than his work email.

> > @@ -150,6 +155,7 @@ Mark Levedahl <mdl123@verizon.net> <mlevedahl@gmail.com>
> >  Mark Rada <marada@uwaterloo.ca>
> >  Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
> >  Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
> > +Masaya Suzuki <masayasuzuki@google.com><draftcode@gmail.com>
> 
> It is a bit surprising that we can take an entry without SP in
> between two addresses and still behave sensibley, but it probably
> makes more sense to add one just to look similar to other entries.

Whoops. Thanks, fixed!

> Thanks for working on this.

You're welcome.

v2 about to be sent,
Dscho

  reply	other threads:[~2018-11-09 11:29 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-08 17:08 [PATCH 0/1] Update .mailmap Johannes Schindelin via GitGitGadget
2018-11-08 17:08 ` [PATCH 1/1] " Johannes Schindelin via GitGitGadget
2018-11-09  2:48   ` Junio C Hamano
2018-11-09 11:29     ` Johannes Schindelin [this message]
2018-11-09 11:31 ` [PATCH v2 0/1] " Johannes Schindelin via GitGitGadget
2018-11-09 11:31   ` [PATCH v2 1/1] " Johannes Schindelin via GitGitGadget
2018-11-12  3:54     ` 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=nycvar.QRO.7.76.6.1811091216490.39@tvgsbejvaqbjf.bet \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    /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).