From 84212c8c04060f916c50a60651174bdbc727dc7d Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Wed, 18 Feb 2009 15:26:54 -0800
Subject: Simplify AUTHORS.sh

Let git-shortlog do the hard work for us, with the user
mappings now listed in ".mailmap".
---
 .mailmap   | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AUTHORS    |  4 ++--
 AUTHORS.sh | 61 +++----------------------------------------------------------
 3 files changed, 62 insertions(+), 60 deletions(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..ec2b1609
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,57 @@
+# Early history did not include userid->full-name mappings, so we do
+# that explicitly here.
+
+Ananth N Mavinakayanahalli <ananth>
+Anil Keshavamurthy <askeshav>
+bibo mao <maobibo>
+Brad Chen <bradchen>
+Charles Spirakis <cspiraki>
+Dave Brolley <brolley>
+Dave Nomura <dcnomura>
+David Smith <dsmith>
+David Wilder <dwilder>
+Denys Vlasenko <dvlasenk>
+Don Domingo <ddomingo>
+Elliott Baron <ebaron>
+Eugene Teo <eteo>
+Frank Ch. Eigler <fche>
+Graydon Hoare <graydon>
+Hien Nguyen <hien>
+Jim Keniston <kenistoj>
+Josh Stone <jistone>
+Kent Sebastian <ksebasti>
+Kevin Stafford <kevinrs>
+K.Prasad <prasadkr>
+Li Guanglei <guanglei>
+Mark McLoughlin <markmc>
+Martin Hunt <hunt>
+Masami Hiramatsu <hiramatu>
+Maynard Johnson <maynardj>
+Michael Behm <mbehm>
+Mike Mason <mmason>
+Prasanna S Panchamukhi <prasannasp>
+Prerna Saxena <prerna>
+Rajan Arora <rarora>
+Roland McGrath <roland>
+Rusty Lynch <rustyl>
+Shaohua Li <shli>
+Srikar Dronamraju <srikar>
+Srinivasa DS <srinivasa>
+Thang Nguyen <tpnguyen>
+Tom Zanussi <trz>
+Wenji Huang <wenji>
+William Cohen <wcohen>
+Zhaolei <ostrichfly>
+Zhaolei <zhaolei>
+
+# Normalize a few git commit names too
+
+Anithra Janakiraman <anithra@linux.vnet.ibm.com>
+Dave Nomura <dcn@vervainp2.rchland.ibm.com>
+Don Domingo <ddomingo@redhat.com>
+K.Prasad <prasad@linux.vnet.ibm.com>
+K.Prasad <root@srdronam.in.ibm.com>
+Kent Sebastian <root@toddy.(none)>
+Srinivasa DS <srinivasa@in.ibm.com>
+Wenji Huang <wjhuang@dhcp-beijing-cdc-10-182-120-233.cn.oracle.com>
+William Cohen <wcohen@peloton.usersys.redhat.com>
diff --git a/AUTHORS b/AUTHORS
index 88d5b522..9827bc67 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
 Ananth N Mavinakayanahalli
 Anil Keshavamurthy
-anithra
+Anithra Janakiraman
 Charles Spirakis
 Dave Brolley
 Dave Nomura
@@ -16,9 +16,9 @@ Hien Nguyen
 James Bottomley
 Jim Keniston
 Josh Stone
+K.Prasad
 Kent Sebastian
 Kevin Stafford
-K Prasad
 Li Guanglei
 Mark McLoughlin
 Mark Wielaard
diff --git a/AUTHORS.sh b/AUTHORS.sh
index ba7a54d6..08b7f222 100755
--- a/AUTHORS.sh
+++ b/AUTHORS.sh
@@ -5,61 +5,6 @@
 # Run as "AUTHORS.sh" to get complete history
 # Run with "AUTHORS.sh commitish..commitish" for history between tags
 
-# Early history did not include userid->full-name mappings, so we do
-# that explicitly here.
-
-sedcmd="$sedcmd -e s/^fche$/Frank_Ch._Eigler/"
-sedcmd="$sedcmd -e s/^brolley$/Dave_Brolley/"
-sedcmd="$sedcmd -e s/^kenistoj$/Jim_Keniston/"
-sedcmd="$sedcmd -e s/^dsmith$/David_Smith/"
-sedcmd="$sedcmd -e s/^hunt$/Martin_Hunt/"
-sedcmd="$sedcmd -e s/^roland$/Roland_McGrath/"
-sedcmd="$sedcmd -e s/^wcohen$/Will_Cohen/"
-sedcmd="$sedcmd -e s/^graydon$/Graydon_Hoare/"
-sedcmd="$sedcmd -e s/^ananth$/Ananth_N_Mavinakayanahalli/"
-sedcmd="$sedcmd -e s/^mbehm$/Michael_Behm/"
-sedcmd="$sedcmd -e s/^bradchen$/Brad_Chen/"
-sedcmd="$sedcmd -e s/^trz$/Tom_Zanussi/"
-sedcmd="$sedcmd -e s/^rustyl$/Rusty_Lynch/"
-sedcmd="$sedcmd -e s/^askeshav$/Anil_Keshavamurthy/"
-sedcmd="$sedcmd -e s/^cspiraki$/Charles_Spirakis/"
-sedcmd="$sedcmd -e s/^prasannasp$/Prasanna_S_Panchamukhi/"
-sedcmd="$sedcmd -e s/^hien$/Hien_Nguyen/"
-sedcmd="$sedcmd -e s/^kevinrs$/Kevin_Stafford/"
-sedcmd="$sedcmd -e s/^jistone$/Josh_Stone/"
-sedcmd="$sedcmd -e s/^hiramatu$/Masami_Hiramatsu/"
-sedcmd="$sedcmd -e s/^markmc$/Mark_McLoughlin/"
-sedcmd="$sedcmd -e s/^eteo$/Eugene_Teo/"
-sedcmd="$sedcmd -e s/^guanglei$/Li_Guanglei/"
-sedcmd="$sedcmd -e s/^tpnguyen$/Thang_Nguyen/"
-sedcmd="$sedcmd -e s/^maobibo$/bibo_mao/"
-sedcmd="$sedcmd -e s/^dwilder$/David_Wilder/"
-sedcmd="$sedcmd -e s/^mmason$/Mike_Mason/"
-sedcmd="$sedcmd -e s/^srikar$/Srikar_Dronamraju/"
-sedcmd="$sedcmd -e s/^srinivasa$/Srinivasa_DS/"
-sedcmd="$sedcmd -e s/^wenji$/Wenji_Huang/"
-sedcmd="$sedcmd -e s/^ostrichfly$/Zhaolei/"
-sedcmd="$sedcmd -e s/^zhaolei$/Zhaolei/"
-sedcmd="$sedcmd -e s/^shli$/Shaohua_Li/"
-sedcmd="$sedcmd -e s/^prasadkr$/K.Prasad/"
-sedcmd="$sedcmd -e s/^dcnomura$/Dave_Nomura/"
-sedcmd="$sedcmd -e s/^ddomingo$/Don_Domingo/"
-sedcmd="$sedcmd -e s/^rarora$/Rajan_Arora/"
-sedcmd="$sedcmd -e s/^prerna$/Prerna_Saxena/"
-sedcmd="$sedcmd -e s/^dvlasenk$/Denys_Vlasenko/"
-sedcmd="$sedcmd -e s/^ebaron$/Elliott_Baron/"
-sedcmd="$sedcmd -e s/^ksebasti$/Kent_Sebastian/"
-sedcmd="$sedcmd -e s/^maynardj$/Maynard_Johnson/"
-
-# tweaks
-sedcmd="$sedcmd -e s/^root$//"
-sedcmd="$sedcmd -e s/^dcn$/Dave_Nomura/"
-sedcmd="$sedcmd -e s/^Srinivasa$/Srinivasa_DS/"
-sedcmd="$sedcmd -e s/^Will.Cohen$/William_Cohen/"
-
-
-# echo $sedcmd
-git log --pretty=format:"%an" ${1-} | 
-sed -e 's/ /_/g' | sed $sedcmd | sed -e 's/_/ /g' | 
-grep . |
-sort | uniq # -c
+# shortlog will canonicalize the names using the file .mailmap
+git shortlog -s ${1-} |
+cut -b8- # strip the commit counts
-- 
cgit