summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap16
-rwxr-xr-xsetup.py4
2 files changed, 19 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..d8ac934
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+# 'git shortlog --help' and look for mailmap for the format of each line
+
+# Email consolidation:
+# <Preferred address in AUTHORS> <other alias used by same author>
+
+<jdenemar@redhat.com> <Jiri.Denemark@gmail.com>
+<jfehlig@suse.com> <jfehlig@novell.com>
+<stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
+
+# Name consolidation:
+# Preferred author spelling <preferred email>
+Alex Jia <ajia@redhat.com>
+Ján Tomko <jtomko@redhat.com>
+MATSUDA Daiki <matsudadik@intellilink.co.jp>
+Serge E. Hallyn <serge.hallyn@canonical.com>
+Philipp Hahn <hahn@univention.de>
diff --git a/setup.py b/setup.py
index 2571742..7a1964b 100755
--- a/setup.py
+++ b/setup.py
@@ -176,7 +176,9 @@ class my_sdist(sdist):
f = os.popen("git log --pretty=format:'%aN <%aE>'")
authors = []
for line in f:
- authors.append(" " + line.strip())
+ line = " " + line.strip()
+ if line not in authors:
+ authors.append(line)
authors.sort(key=str.lower)