v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address, 2018-05-08) changed the mailmap to map sandals@xxxxxxxxxxxxxxxxxxxxxxx -> brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> instead of sandals@xxxxxxxxxxxxxxxxxxxx -> brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxxxxx> That means the mapping Brian M. Carlson <sandals@xxxxxxxxxxxxxxxxxxxxxxx> -> brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> is redundant, so we can remove it. More importantly, it means that the identity "Brian M. Carlson <sandals@xxxxxxxxxxxxxxxxxxxx>" 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 <jrnieder@xxxxxxxxx> --- brian m. carlson wrote: > On Tue, May 22, 2018 at 03:08:26PM -0700, Jonathan Nieder wrote: >> These commits use author Brian M. Carlson <sandals@xxxxxxxxxxxxxxxxxxxx>. >> Previously they matched >> >> brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxxxxx> <sandals@xxxxxxxxxxxxxxxxxxxx> >> >> but now they don't match any line in the .mailmap file. >> >> Should we add a line >> >> brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> >> >> 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 <bdwalton@xxxxxxxxx> <bwalton@xxxxxxxxxxxxxxxxxx> Benoit Sigoure <tsunanet@xxxxxxxxx> <tsuna@xxxxxxxxxxxxx> Bernt Hansen <bernt@xxxxxxxxx> <bernt@xxxxxxxxxxxxxxxxxxx> Brandon Casey <drafnel@xxxxxxxxx> <casey@xxxxxxxxxxxxxxx> -brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> Brian M. Carlson <sandals@xxxxxxxxxxxxxxxxxxxxxxx> +brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> Brian M. Carlson <sandals@xxxxxxxxxxxxxxxxxxxx> brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> <sandals@xxxxxxxxxxxxxxxxxxxxxxx> Bryan Larsen <bryan@xxxxxxxxx> <bryan.larsen@xxxxxxxxx> Bryan Larsen <bryan@xxxxxxxxx> <bryanlarsen@xxxxxxxxx> -- 2.19.0.397.gdd90340f6a