v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address,
2018-05-08) changed the mailmap to map

  [email protected]
   -> brian m. carlson <[email protected]>

instead of

  [email protected]
    -> brian m. carlson <[email protected]>

That means the mapping

  Brian M. Carlson <[email protected]>
    -> brian m. carlson <[email protected]>

is redundant, so we can remove it.  More importantly, it means that
the identity "Brian M. Carlson <[email protected]>" 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 <[email protected]>
---
brian m. carlson wrote:
> On Tue, May 22, 2018 at 03:08:26PM -0700, Jonathan Nieder wrote:

>> These commits use author Brian M. Carlson <[email protected]>.
>> Previously they matched
>>
>>      brian m. carlson <[email protected]> 
>> <[email protected]>
>>
>> but now they don't match any line in the .mailmap file.
>>
>> Should we add a line
>>
>>      brian m. carlson <[email protected]>
>>
>> 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 <[email protected]> <[email protected]>
 Benoit Sigoure <[email protected]> <[email protected]>
 Bernt Hansen <[email protected]> <[email protected]>
 Brandon Casey <[email protected]> <[email protected]>
-brian m. carlson <[email protected]> Brian M. Carlson 
<[email protected]>
+brian m. carlson <[email protected]> Brian M. Carlson 
<[email protected]>
 brian m. carlson <[email protected]> 
<[email protected]>
 Bryan Larsen <[email protected]> <[email protected]>
 Bryan Larsen <[email protected]> <[email protected]>
-- 
2.19.0.397.gdd90340f6a

Reply via email to