aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Norris <[email protected]>2023-08-06 01:58:45 +1000
committerBrian Behlendorf <[email protected]>2023-10-10 19:19:09 -0700
commitda93b72c91ae187987f29fa248b28e4b8c94df93 (patch)
tree9b7c3ad4a9f62ca6f0c590ead842a2466b52068f
parent9fa06c5574f1b4036ed187729070194f7f43522b (diff)
mailmap: initial, trying to tidy up a lot of the commit history
This comes from the observation that a huge number of commit author fields look quite strange (to my eyes), but quite often the Signed-off-by: trailer has the correct name. For these I have updated the name where it was obvious how to do so, however, I have not created a mapping for the commit email to the Signed-off-by email, as whatever I choose for email will become the prime candidate for inclusion in the AUTHORS file, and care needs to be taken when acting without explicit consent. There's a small handful of commits that look like they were done on local machines, or CI hosts, or similar, where the git authorship config wasn't set up properly. Its obvious what this should look like, so I've just done them. The remainder is mapping Github noreply emails to either an obviously-correct Signed-off-by trailer, or to a an author from another commit. This was mostly done by hand, so there may be errors, but I think its close. I do not understand where these come from - I know that they're what commits made via Github web look like when there's no real address set on the account, but I find it hard to believe that so many of these came through the web, especially given the complexity of most of the changes. I suspect there's some kind of merge helper tool in play here. Regardless, the history is set now, and this tries to get it back on track. Obviously, all of this helps the history look tidy, but this also feeds into the AUTHORS update script. See next commit. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Tino Reichardt <[email protected]> Signed-off-by: Rob Norris <[email protected]> Closes #15374
-rw-r--r--.gitignore1
-rw-r--r--.mailmap189
2 files changed, 190 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 1ef47d921..47d17ae16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@
!.cirrus.yml
!.gitignore
!.gitmodules
+!.mailmap
!AUTHORS
!autogen.sh
!CODE_OF_CONDUCT.md
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..46ef016b9
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,189 @@
+# This file maps the name+email seen in a commit back to a canonical
+# name+email. Git will replace the commit name/email with the canonical version
+# wherever it sees it.
+#
+# If there is a commit in the history with a "wrong" name or email, list it
+# here. If you regularly commit with an alternate name or email address and
+# would like to ensure that you are always listed consistently in the repo, add
+# mapping here.
+#
+# On the other hand, if you use multiple names or email addresses legitimately
+# (eg you use a company email address for your paid OpenZFS work, and a
+# personal address for your evening side projects), then don't map one to the
+# other here.
+#
+# The most common formats are:
+#
+# Canonical Name <canonical-email>
+# Canonical Name <canonical-email> <commit-email>
+# Canonical Name <canonical-email> Commit Name <commit-email>
+#
+# See https://git-scm.com/docs/gitmailmap for more info.
+
+# These maps are making names consistent where they have varied but the email
+# address has never changed. In most cases, the full name is in the
+# Signed-off-by of a commit with a matching author.
+Ahelenia Ziemiańska <[email protected]>
+Ahelenia Ziemiańska <[email protected]>
+Alex John <[email protected]>
+Andreas Dilger <[email protected]>
+Andrew Walker <[email protected]>
+Benedikt Neuffer <[email protected]>
+Chengfei Zhu <[email protected]>
+Chris Lindee <[email protected]>
+Colm Buckley <[email protected]>
+Crag Wang <[email protected]>
+Damian Szuberski <[email protected]>
+Daniel Kolesa <[email protected]>
+Debabrata Banerjee <[email protected]>
+Finix Yan <[email protected]>
+Gaurav Kumar <[email protected]>
+Gionatan Danti <[email protected]>
+Glenn Washburn <[email protected]>
+Gordan Bobic <[email protected]>
+Gregory Bartholomew <[email protected]>
+hedong zhang <[email protected]>
+InsanePrawn <[email protected]>
+Jason Cohen <[email protected]>
+Jason Harmening <[email protected]>
+Jeremy Faulkner <[email protected]>
+Jinshan Xiong <[email protected]>
+John Poduska <[email protected]>
+Justin Scholz <[email protected]>
+Ka Ho Ng <[email protected]>
+Kash Pande <[email protected]>
+Kay Pedersen <[email protected]>
+KernelOfTruth <[email protected]>
+Liu Qing <[email protected]>
+Matthias Blankertz <[email protected]>
+Michael Gmelin <[email protected]>
+Olivier Mazouffre <[email protected]>
+Piotr Kubaj <[email protected]>
+Quentin Zdanis <[email protected]>
+Roberto Ricci <[email protected]>
+Rob Norris <[email protected]>
+Rob Norris <[email protected]>
+Sam Lunt <[email protected]>
+Sanjeev Bagewadi <[email protected]>
+Stoiko Ivanov <[email protected]>
+Tamas TEVESZ <[email protected]>
+Yanping Gao <[email protected]>
+Youzhong Yang <[email protected]>
+
+# Commits from strange places, long ago
+Brian Behlendorf <[email protected]> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
+Brian Behlendorf <[email protected]> <behlendo@fedora-17-amd64.(none)>
+Brian Behlendorf <[email protected]> <behlendo@myhost.(none)>
+Herb Wartens <[email protected]> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
+Ned Bass <[email protected]> <bass6@zeno1.(none)>
+
+# Mappings from Github no-reply addresses
+Alexander Lobakin <[email protected]> <[email protected]>
+Andrew J. Hesford <[email protected]> <[email protected]>>
+Dacian Reece-Stremtan <[email protected]> <[email protected]>
+Dmitri John Ledkov <[email protected]> <[email protected]>
+Gian-Carlo DeFazio <[email protected]> <[email protected]>
+Giuseppe Di Natale <[email protected]> <[email protected]>
+João Carlos Mendes Luís <[email protected]> <[email protected]>
+Jonathon Fernyhough <[email protected]> <[email protected]>
+Krzysztof Piecuch <[email protected]> <[email protected]>
+Laurențiu Nicola <[email protected]> <[email protected]>
+Michael Niewöhner <[email protected]> <[email protected]>
+Pablo Correa Gómez <[email protected]> <[email protected]>
+Piotr P. Stefaniak <[email protected]> <[email protected]>
+Samuel Wycliffe J <[email protected]> <[email protected]>
+Torsten Wörtwein <[email protected]> <[email protected]>
+Vipin Kumar Verma <[email protected]> <[email protected]>
+Wolfgang Bumiller <[email protected]> <[email protected]>