From fc499aa541982c1540c87fa25800668df3fbbb79 Mon Sep 17 00:00:00 2001
From: Loic Dachary <loic-201408@dachary.org>
Date: Sun, 31 Aug 2014 19:14:55 +0200
Subject: [PATCH] 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>
---
 .mailmap         |  4 ++++
 .organizationmap |  6 +++++-
 .peoplemap       | 23 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 .peoplemap

diff --git a/.mailmap b/.mailmap
index 029d0cd950b6..3db9a7f732d6 100644
--- 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 083c1a13758c..fee98396493e 100644
--- 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
index 000000000000..705f3e16b193
--- /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>
-- 
2.47.3