Use consistent author names for the copyright headers.

diff --git a/contrib/get-authors b/contrib/get-authors
index 4c1bb023332768d463a7aa810f38dfc5e0b67bdc..34ebdf5e3e3d3a79285ce87df271b1d71066a2ba 100755 (executable)
--- a/contrib/get-authors
+++ b/contrib/get-authors
@@ -23,9 +23,20 @@ while [ $# -gt 0 ]; do
   shift
   contributors=
   total_lines=`wc -l "$f" | awk '{print$1}'`
-  git blame --incremental "$f" | gawk '/^[0-9a-f]+ [0-9]+ [0-9]+ [0-9]+$/ {nl=$4;} /^summary .*copyright/ {nl=0} /^author / {$1=""; author=$0;} /^author-mail / {mail=$2} /^filename / {while(nl--) {print author,mail}}' | sed "s,Not Committed Yet <not.committed.yet>,$gituser," | sort | uniq -c | sort -nr | head -n 3 |
+  git blame --incremental "$f" | \
+    gawk '/^[0-9a-f]+ [0-9]+ [0-9]+ [0-9]+$/ {nl=$4;} /^summary .*copyright/ {nl=0} /^author / {$1=""; author=$0;} /^author-mail / {mail=$2} /^filename / {while(nl--) {print author,mail}}' | \
+    sed "s,Not Committed Yet <not.committed.yet>,$gituser," | \
+    sed 's/PaulMeng/Paul Meng/' | \
+    sed 's/barrettcw/Clark Barrett/' | \
+    sed 's/Andres Nötzli/Andres Noetzli/' | \
+    sed 's/Andres Notzli/Andres Noetzli/' | \
+    sed 's/guykatzz/Guy/' | \
+    sed 's/Guy Katz/Guy/' | \
+    sed 's/Guy/Guy Katz/' | \
+    eval "$strip_email" | \
+    sort | uniq -c | sort -nr | head -n 3 | \
     ( while read lines author; do
         contributors="${contributors:+$contributors, }$author"
       done; \
-      echo "$contributors") | eval "$strip_email"
+      echo "$contributors")
 done