fix(git-svn-fix-authors): Allow middle names.

And don't overuse export when it is not needed.

1 files changed, 10 insertions, 4 deletions

diff --git a/git-svn-fix-authors.sh b/git-svn-fix-authors.sh
index f78bfbe..16acdf4 100755
--- a/git-svn-fix-authors.sh
+++ b/git-svn-fix-authors.sh
@@ -3,19 +3,25 @@ set -eu
 
 AUTHORS_FILE=$(git config svn.authorsfile) || {
     echo "ERROR: set config.svn.authorsfile!"
-    exit 1
+    exit 128
 }
 export AUTHORS_FILE=$(readlink -f $AUTHORS_FILE)
 
 git filter-branch --env-filter '
 
 function replacement() {
-    REPL=$(awk -F"[[:space:]]*=[[:space:]]*" "/$1/ {print \$2;}" $AUTHORS_FILE)
-    MAIL=$(echo $REPL|awk "{print \$NF}"|tr -d "<>" )
-    NAME=$(echo $REPL|awk "{print \$1, \$2}" )
+    REPL=$(awk -F"[[:space:]]*=[[:space:]]*" "/$1/ {print \$2}" $AUTHORS_FILE)
+    MAIL=$(echo "$REPL"|awk "{print \$NF}"|tr -d "<>" )
+    NAME=$(echo "$REPL"|awk "{print gensub(/[[:space:]]*<[^[:space:]]*/,\"\",\"\")}" )
 }
 
 replacement "${GIT_AUTHOR_NAME}"
+if [ "x$NAME" == "x" ] ; then
+    echo -e "\nERROR: When changing ${GIT_COMMIT} we got empty reply."
+    echo -e "I do not know how to map ${GIT_AUTHOR_NAME}.\n"
+    set|grep ^GIT
+    exit 1
+fi
 
 export GIT_AUTHOR_NAME="$NAME"
 export GIT_AUTHOR_EMAIL="$MAIL"