All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] mailmap: update brian m. carlson's email address
Date: Mon, 07 May 2018 12:37:05 +0900	[thread overview]
Message-ID: <xmqqa7tcqgpq.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180506232421.975789-1-sandals@crustytoothpaste.net> (brian m. carlson's message of "Sun, 6 May 2018 23:24:21 +0000")

"brian m. carlson" <sandals@crustytoothpaste.net> writes:

> The order of addresses in the mailmap file was reversed, leading to git
> preferring the crustytoothpaste.ath.cx address, which is obsolete, over
> the crustytoothpaste.net address, which is current.  Switch the order of
> the addresses so that git log displays the correct address.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---

I initially reacted to "was reversed" with "yikes, did we break the
mailmap reader and we need to update the file?", but apparently that
is not what this patch is about.  I think what is happening here is
that cdb6b5ac (".mailmap: Combine more (name, email) to individual
persons", 2013-08-12) removed

-Brian M. Carlson <sandals@crustytoothpaste.ath.cx>

and then added these two lines

+brian m. carlson <sandals@crustytoothpaste.ath.cx> Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+brian m. carlson <sandals@crustytoothpaste.ath.cx> <sandals@crustytoothpaste.net>

where *.net address did not come from any other entry for you in the
file.  I guess the author of the patch saw that you were sending
your messages from the .net address and tried to help by unifying
the two addresses, without knowing your preference and recorded two
reversed entries.

Will queue as-is for now, but if you want to update the log message
I do not mind taking a reroll.

Thanks.


>  .mailmap | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index 7c71e88ea5..df7cf6313c 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -25,8 +25,8 @@ Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
>  Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr>
>  Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
>  Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
> -brian m. carlson <sandals@crustytoothpaste.ath.cx> Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
> -brian m. carlson <sandals@crustytoothpaste.ath.cx> <sandals@crustytoothpaste.net>
> +brian m. carlson <sandals@crustytoothpaste.net> Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
> +brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx>
>  Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
>  Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
>  Cheng Renquan <crquan@gmail.com>

  reply	other threads:[~2018-05-07  3:37 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-06 23:24 [PATCH] mailmap: update brian m. carlson's email address brian m. carlson
2018-05-07  3:37 ` Junio C Hamano [this message]
2018-05-07 19:25   ` Stefan Beller
2018-05-07 23:53     ` brian m. carlson
2018-05-07 23:44   ` brian m. carlson
2018-05-08  1:58 ` [PATCH v2] " brian m. carlson
2018-05-08  3:21   ` Junio C Hamano
2018-05-08  5:04   ` Kaartic Sivaraam
2018-05-09  0:19     ` brian m. carlson
2018-05-09  7:03       ` Kaartic Sivaraam
2018-05-10 23:13         ` brian m. carlson
2018-05-22 22:08   ` Jonathan Nieder
2018-05-22 22:42     ` brian m. carlson
2018-09-17 18:18       ` [PATCH] mailmap: consistently normalize brian m. carlson's name Jonathan Nieder
2018-09-17 22:21         ` brian m. carlson
2018-09-24 17:39           ` [PATCH v2] " Jonathan Nieder
2018-09-25  1:15             ` brian m. carlson
2018-09-25  2:13               ` Jonathan Nieder

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=xmqqa7tcqgpq.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=sandals@crustytoothpaste.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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.