git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>, Ben Peart <peartben@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH 3/3] .mailmap: map names with multiple emails to the same author identity
Date: Fri, 29 Jun 2018 11:38:26 -0700	[thread overview]
Message-ID: <CAGZ79kbG29SbsR=+7qwM+++Jk+G2AWYswQY1tYJy2KMSCKr8FQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqh8llv690.fsf@gitster-ct.c.googlers.com>

On Fri, Jun 29, 2018 at 10:42 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Stefan Beller <sbeller@google.com> writes:
>
> > There are multiple author idents who have different email addresses, but
> > the same name; assume they are the same person, as the world of open source
> > is actually rather small.
>
> Thanks for an interesting experiment.  As with 2/3, I suspect that
> most of the contents in the patch may be correct, but I'd rather see
> these confirmed by those whose names appear in the patch.
>
> IOW, I would not feel comfortable applying a patch, unless it looks
> like this (just taking a single person as a random example),
> and I do not mind many such individual patches:

right, I did not quite expect this patch to be applied, though it looked
like such a sweet shortcut.

I might just email all of them and ask for them to update
their .mailmap entries.

Thanks,
Stefan

>     Subject: .mailmap: unify the same Ben Peart

cc'd Ben, so we could start here with a patch. :)

>     These multiple author identities in our history are actually the
>     same person.  Map them to the latest address.
>
>     Signed-off-by: Stefan Beller <sbeller@google.com>
>     Acked-by: Ben Peart <Ben.Peart@microsoft.com>
>     ---
>
>     diff --git a/.mailmap b/.mailmap
>     index ff96ef7401f..2607846582a 100644
>     --- a/.mailmap
>     +++ b/.mailmap
>     @@ -5,54 +5,86 @@
>      Amos Waterland <apw@debian.org> <apw@us.ibm.com>
>      Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
>      Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr>
>     +Ben Peart <Ben.Peart@microsoft.com> Ben Peart <benpeart@microsoft.com>
>     +Ben Peart <Ben.Peart@microsoft.com> Ben Peart <peartben@gmail.com>
>      Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
>      Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
>
> It may be even better if we can arraange the author of the patch to
> be the one who is involved, with "Helped-by: Stefan".

ok, I'll think how I can help but not write the code.

Thanks,
Stefan

  reply	other threads:[~2018-06-29 18:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-29  2:10 [PATCH 1/3] .mailmap: merge different spellings of names Stefan Beller
2018-06-29  2:10 ` [PATCH 2/3] .mailmap: assume Jason McMullan to be the same person Stefan Beller
2018-06-29 16:33   ` Junio C Hamano
2018-06-29  2:10 ` [PATCH 3/3] .mailmap: map names with multiple emails to the same author identity Stefan Beller
2018-06-29 17:42   ` Junio C Hamano
2018-06-29 18:38     ` Stefan Beller [this message]
2018-06-29 19:41       ` Junio C Hamano
2018-06-29 17:43 ` [PATCH 1/3] .mailmap: merge different spellings of names 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAGZ79kbG29SbsR=+7qwM+++Jk+G2AWYswQY1tYJy2KMSCKr8FQ@mail.gmail.com' \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peartben@gmail.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.
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 NNTP newsgroup(s).