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]> --- Hi, brian m. carlson wrote: > I think this commit message makes sense. I apparently still fail to > understand how the .mailmap format works, so I can't tell you if the > patch is correct. Thanks for looking it over. What would it take to make the patch make sense, too? ;-) Most mailmap entries are of the form Some Name <[email protected]> which means "Wherever you see the email address [email protected], canonicalize the author's name to Some Name". We can use that: brian m. carlson <[email protected]> When we see [email protected], we also want to canonicalize the email address. For that, we can do brian m. carlson <[email protected]> <[email protected]> There's only one person who has used these email addresses, so we don't have to do matching by name. If we wanted to tighten the name normalization to match by name, I think we'd do something like brian m. carlson <[email protected]> Brian M. Carlson but I can't get that to seem to have any effect when I test with the "git check-mailmap" command --- for example, "git check-mailmap 'Dana How <[email protected]>'" does not map and "git check-mailmap 'Random Name <[email protected]>'" maps to 'Dana L. How <[email protected]>'. The even tighter matching used in v1 brian m. carlson <[email protected]> Brian M. Carlson <[email protected]> does work, but it's unnecessary complexity. We don't need it. How about this? Changes since v1: - loosened the matching to only look at email and ignore name - no other changes .mailmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index f165222a78..bef3352b0d 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]> <[email protected]> Bryan Larsen <[email protected]> <[email protected]> Bryan Larsen <[email protected]> <[email protected]> -- 2.19.0.444.g18242da7ef
