[Libguestfs] [PATCH] Add the .mailmap and change the method to generate AUTHORS
Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com>
---
.mailmap | 13 +++++++++++++
AUTHORS | 4 ++--
Makefile.am | 5 +----
3 files changed, 16 insertions(+), 6 deletions(-)
create mode 100644 .mailmap
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..504fd79
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,13 @@
+Jim Meyering <meyering(a)redhat.com> <jim(a)meyering.net>
+Jim Meyering <meyering(a)redhat.com> <meyering(a)vv.meyering.net.meyering.net>
+Richard W.M. Jones <rjones(a)redhat.com> Richard Jones
<rich(a)hakodate.home.annexia.org>
+Richard W.M. Jones <rjones(a)redhat.com> Richard Jones
<rich(a)koneko.home.annexia.org>
+Richard W.M. Jones <rjones(a)redhat.com> Richard Jones <rich(a)koneko.local>
+Richard W.M. Jones <rjones(a)redhat.com> Richard Jones
<rjones(a)centos5x32.home.annexia.org>
+Richard W.M. Jones <rjones(a)redhat.com> Richard Jones
<rjones(a)debian5x64.home.annexia.org>
+Richard W.M. Jones <rjones(a)redhat.com> Richard Jones <rjones(a)redhat.com>
+Richard W.M. Jones <rjones(a)redhat.com> Richard Jones
<rjones(a)trick.home.annexia.org>
+Richard W.M. Jones <rjones(a)redhat.com> Richard Jones
<rjones(a)ubuntu910x64.home.annexia.org>
+Richard W.M. Jones <rjones(a)redhat.com> <rich(a)annexia.org>
+Richard W.M. Jones <rjones(a)redhat.com> rjones <rjones>
+Wanlong Gao <gaowanlong(a)cn.fujitsu.com> <wanlong.gao(a)gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 6588c61..eb1e296 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,7 +10,7 @@ Geert Warrink <geert.warrink(a)onsnet.nu>
Guido Günther <agx(a)sigxcpu.org>
Hilko Bengen <bengen(a)hilluzination.de>
Jaswinder Singh <jsingh(a)redhat.com>
-Jim Meyering <jim(a)meyering.net>
+Jim Meyering <meyering(a)redhat.com>
Jiri Popelka <jpopelka(a)redhat.com>
John Eckersberg <jeckersb(a)redhat.com>
Karel Klíč <kklic(a)redhat.com>
@@ -25,7 +25,7 @@ Olaf Hering <olaf(a)aepfle.de>
Piotr Drąg <piotrdrag(a)gmail.com>
Qin Guan <qguan(a)redhat.com>
Rajesh Ranjan <rranjan(a)redhat.com>
-Richard W.M. Jones <rich(a)annexia.org>
+Richard W.M. Jones <rjones(a)redhat.com>
Sandeep Shedmake <sshedmak(a)redhat.com>
Shankar Prasad <svenkate(a)redhat.com>
Thomas S Hatch <thatch45(a)gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 1ae7849..9b307b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -240,10 +240,7 @@ dist-hook:
$(top_srcdir)/update-bugs.sh > BUGS-t
mv BUGS-t BUGS
cp BUGS $(distdir)/BUGS
- git log --pretty="format:%an <%ae>" | sort -u | uniq -w 10 | \
- grep -v rjones | \
- grep -v "Richard Jones" \
- > AUTHORS-t
+ git shortlog -se | awk -F'\t' '{print $$2}' > AUTHORS-t
mv AUTHORS-t AUTHORS
cp AUTHORS $(distdir)/AUTHORS
--
1.8.0