v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address,
2018-05-08) changed the mailmap to map
sand...@crustytoothpaste.ath.cx
-> brian m. carlson <sand...@crustytoothpaste.net>
instead of
sand...@crustytoothpaste.net
-> brian m. carlson <sand...@crustytoothpaste.ath.cx>
That means the mapping
Brian M. Carlson <sand...@crustytoothpaste.ath.cx>
-> brian m. carlson <sand...@crustytoothpaste.net>
is redundant, so we can remove it. More importantly, it means that
the identity "Brian M. Carlson <sand...@crustytoothpaste.net>" used in
some commits is not normalized any more. Add a mapping for it.
Noticed while updating Debian's Git packaging, which uses "git
shortlog --no-merges" to produce a list of changes in each version,
grouped by author's (normalized) name.
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
brian m. carlson wrote:
> On Tue, May 22, 2018 at 03:08:26PM -0700, Jonathan Nieder wrote:
>> These commits use author Brian M. Carlson <sand...@crustytoothpaste.net>.
>> Previously they matched
>>
>> brian m. carlson <sand...@crustytoothpaste.ath.cx>
>> <sand...@crustytoothpaste.net>
>>
>> but now they don't match any line in the .mailmap file.
>>
>> Should we add a line
>>
>> brian m. carlson <sand...@crustytoothpaste.net>
>>
>> to handle these commits?
>
> Ah, good point. Probably so.
Sorry to leave this hanging for so long. How about this patch?
Thanks,
Jonathan
.mailmap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index f165222a78..29047a110a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,7 +25,7 @@ Ben Walton <bdwal...@gmail.com> <bwal...@artsci.utoronto.ca>
Benoit Sigoure <tsuna...@gmail.com> <ts...@lrde.epita.fr>
Bernt Hansen <be...@norang.ca> <be...@alumni.uwaterloo.ca>
Brandon Casey <draf...@gmail.com> <ca...@nrlssc.navy.mil>
-brian m. carlson <sand...@crustytoothpaste.net> Brian M. Carlson
<sand...@crustytoothpaste.ath.cx>
+brian m. carlson <sand...@crustytoothpaste.net> Brian M. Carlson
<sand...@crustytoothpaste.net>
brian m. carlson <sand...@crustytoothpaste.net>
<sand...@crustytoothpaste.ath.cx>
Bryan Larsen <br...@larsen.st> <bryan.lar...@gmail.com>
Bryan Larsen <br...@larsen.st> <bryanlar...@yahoo.com>
--
2.19.0.397.gdd90340f6a
