mailmap: add .peoplemap

In .mailmap, an individual may be represented by multiple mails which
may reflect an organization affiliation change that needs to be
preserved to find out which organization sponsored which commit.

The .peoplemap file aggregates these mails to show a single line for
each person

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

diff --git a/.mailmap b/.mailmap
index 029d0cd950b6f6023935a8e51363675ee917c16d..3db9a7f732d6dfeb57642814adc30f8daf15c083 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,9 @@
 #
+# More information at
+#  https://wiki.ceph.com/Community/Ceph_contributors_list_maintenance_guide
+#
 # See .organizationmap for organization affiliation
+# See .peoplemap for unique list of people
 #
 Ailing Zhang <zhangal1992@gmail.com> <ailzhang@users.noreply.github.com>
 Abhishek Lekshmanan <abhishek.lekshmanan@ril.com> <abhishek.lekshmanan@gmail.com> 

diff --git a/.organizationmap b/.organizationmap
index 083c1a13758c696f74297580431184ef1d9453b8..fee98396493e2d8e626f66527d9259dc61b225ad 100644 (file)
--- a/.organizationmap
+++ b/.organizationmap
@@ -1,5 +1,9 @@
 #
-# See .mailmap for author normalization.
+# More information at
+#  https://wiki.ceph.com/Community/Ceph_contributors_list_maintenance_guide
+#
+# See .mailmap for name and mail normalization.
+# See .peoplemap for unique list of people
 #
 # To display the 10 organization who contributed 
 # most commits to ceph ( requires git >= 1.8.4 ):

diff --git a/.peoplemap b/.peoplemap
new file mode 100644 (file)
index 0000000..705f3e1
--- /dev/null
+++ b/.peoplemap
@@ -0,0 +1,23 @@
+#
+# More information at
+#  https://wiki.ceph.com/Community/Ceph_contributors_list_maintenance_guide
+#
+# See .mailmap for name and mail normalization.
+# See .organizationmap for organization affiliation
+#
+# In .mailmap, an individual may be represented by multiple mails which may reflect
+# an organization affiliation change that needs to be preserved to find out which
+# organization sponsored which commit.
+# 
+# The .peoplemap file aggregates these mails to show a single line for each person
+#
+# The names that need to be added to .peoplemap can be displayed with:
+#
+# git log --pretty='%aN <%aE>' $range | git -c mailmap.file=.peoplemap check-mailmap --stdin | sort | uniq | sed -e 's/\(.*\) \(<.*\)/\2 \1/' | uniq --skip-field=1 --all-repeated | sed -e 's/\(.*>\) \(.*\)/\2 \1/'
+#
+David Zafman <dzafman@redhat.com> David Zafman <david.zafman@inktank.com>
+John Spray <jspray@redhat.com> John Spray <john.spray@inktank.com>
+Loic Dachary <loic@dachary.org> Loic Dachary <loic-201408@dachary.org>
+Ross Turk <rturk@redhat.com> Ross Turk <ross.turk@inktank.com>
+Sage Weil <sweil@redhat.com> Sage Weil <sage@inktank.com>
+Yehuda Sadeh <ysadey@redhat.com> Yehuda Sadeh <yehuda@inktank.com>