From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 22 May 2018 22:08:26 GMT
Subject: Re: [PATCH v2] mailmap: update brian m. carlson's email address
Message-ID: <20180522220826.GP10623@aiede.svl.corp.google.com>
In-Reply-To: <20180508015845.268572-1-sandals@crustytoothpaste.net>

Hi,

brian m. carlson wrote:

> An earlier change, cdb6b5ac (".mailmap: Combine more (name, email) to
> individual persons", 2013-08-12), noted that there were two name
> spellings and two email addresses and mapped the crustytoothpaste.net
> address to the crustytoothpaste.ath.cx address.  The latter is an older,
> obsolete address, while the former is current, so switch the order of
> the addresses so that git log displays the correct address.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> I intentionally avoided the use of the first person here, because I
> wasn't sure what the preference of the list was on that.  Hopefully it
> reads naturally and isn't awkward.

I have no preference.  First or third person would work equally well
for me for this kind of thing.

[...]
> --- 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>

Today I tried a "git shortlog" run and was surprised to find

  Brian M. Carlson (6):
      Add missing test file for UTF-16.
      submodule: fix confusing variable name
      submodule: don't print status output with ignore=all
      send-email: don't call methods on undefined values
      http-backend: provide Allow header for 405
      remote-curl: fix large pushes with GSSAPI

These commits use author Brian M. Carlson <sandals@crustytoothpaste.net>.
Previously they matched

	brian m. carlson <sandals@crustytoothpaste.ath.cx> <sandals@crustytoothpaste.net>

but now they don't match any line in the .mailmap file.

Should we add a line

	brian m. carlson <sandals@crustytoothpaste.net>

to handle these commits?

Thanks,
Jonathan