[Libguestfs] [PATCH] Add the .mailmap and change the method to generate AUTHORS

[Wanlong Gao]

Signed-off-by: Wanlong Gao <gaowanlong at 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 at redhat.com> <jim at meyering.net>
+Jim Meyering <meyering at redhat.com> <meyering at vv.meyering.net.meyering.net>
+Richard W.M. Jones <rjones at redhat.com> Richard Jones <rich at hakodate.home.annexia.org>
+Richard W.M. Jones <rjones at redhat.com> Richard Jones <rich at koneko.home.annexia.org>
+Richard W.M. Jones <rjones at redhat.com> Richard Jones <rich at koneko.local>
+Richard W.M. Jones <rjones at redhat.com> Richard Jones <rjones at centos5x32.home.annexia.org>
+Richard W.M. Jones <rjones at redhat.com> Richard Jones <rjones at debian5x64.home.annexia.org>
+Richard W.M. Jones <rjones at redhat.com> Richard Jones <rjones at redhat.com>
+Richard W.M. Jones <rjones at redhat.com> Richard Jones <rjones at trick.home.annexia.org>
+Richard W.M. Jones <rjones at redhat.com> Richard Jones <rjones at ubuntu910x64.home.annexia.org>
+Richard W.M. Jones <rjones at redhat.com> <rich at annexia.org>
+Richard W.M. Jones <rjones at redhat.com> rjones <rjones>
+Wanlong Gao <gaowanlong at cn.fujitsu.com> <wanlong.gao at gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 6588c61..eb1e296 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,7 +10,7 @@ Geert Warrink <geert.warrink at onsnet.nu>
 Guido Günther <agx at sigxcpu.org>
 Hilko Bengen <bengen at hilluzination.de>
 Jaswinder Singh <jsingh at redhat.com>
-Jim Meyering <jim at meyering.net>
+Jim Meyering <meyering at redhat.com>
 Jiri Popelka <jpopelka at redhat.com>
 John Eckersberg <jeckersb at redhat.com>
 Karel Klíč <kklic at redhat.com>
@@ -25,7 +25,7 @@ Olaf Hering <olaf at aepfle.de>
 Piotr Drąg <piotrdrag at gmail.com>
 Qin Guan <qguan at redhat.com>
 Rajesh Ranjan <rranjan at redhat.com>
-Richard W.M. Jones <rich at annexia.org>
+Richard W.M. Jones <rjones at redhat.com>
 Sandeep Shedmake <sshedmak at redhat.com>
 Shankar Prasad <svenkate at redhat.com>
 Thomas S Hatch <thatch45 at 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