git-rewrite-authors: support names better

diff --git a/.bin/git-rewrite-authors b/.bin/git-rewrite-authors
index ce93381e79f5b5c9494bd93c0331dafb674606f9..e5d4b081e1b813c95e94d5370d6efcc437336c8a 100755 (executable)
--- a/.bin/git-rewrite-authors
+++ b/.bin/git-rewrite-authors
@@ -4,8 +4,11 @@ tmp=$(mktemp)
 cat << \EOF > ${tmp}
 decode() {
        awk -vid="$1" -vtype="$2" '$1 == id {
-               print "export GIT_"type"_NAME='\''" $3 " " $4 "'\'';"
-               print "export GIT_"type"_EMAIL='\''" $5 "'\'';"
+               match($0, /^[^=]*=\s*([^<]*)<([^>]*)>/, a);
+               name = gensub(/\s+$/, "", "g", a[1]);
+               email = a[2];
+               print "export GIT_"type"_NAME='\''" name "'\'';"
+               print "export GIT_"type"_EMAIL='\''" email "'\'';"
        }' ${author_file}
 }
 EOF