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>
---
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 <someem...@example.com>
which means "Wherever you see the email address someem...@example.com,
canonicalize the author's name to Some Name". We can use that:
brian m. carlson <sand...@crustytoothpaste.net>
When we see sand...@crustytoothpaste.ath.cx, we also want to
canonicalize the email address. For that, we can do
brian m. carlson <sand...@crustytoothpaste.net>
<sand...@crustytoothpaste.ath.cx>
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 <sand...@crustytoothpaste.net> 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 <random.em...@example.com>'" does not map and "git check-mailmap
'Random Name <dana...@gmail.com>'" maps to 'Dana L. How
<dana...@gmail.com>'.
The even tighter matching used in v1
brian m. carlson <sand...@crustytoothpaste.net> Brian M. Carlson
<sand...@crustytoothpaste.net>
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 <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>
<sand...@crustytoothpaste.ath.cx>
Bryan Larsen <br...@larsen.st> <bryan.lar...@gmail.com>
Bryan Larsen <br...@larsen.st> <bryanlar...@yahoo.com>
--
2.19.0.444.g18242da7ef
