Let git-svnimport's author file use same syntax as git-cvsimport's

git-cvsimport uses a username => Full Name <email@addr.es> mapping
file with this syntax:

  kha=Karl Hasselström <kha@treskal.com>

Since there is no reason to use another format for git-svnimport, use
the same format.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index e0e3a5d4e8aa9dce8be88e33606c878e8bb18403..912a80865e7616fc81905616f9b9f86c531ff4ce 100644 (file)
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -75,9 +75,9 @@ When importing incrementally, you might need to edit the .git/svn2git file.
 -A <author_file>::
        Read a file with lines on the form
 
-         username User's Full Name <email@addres.org>
+         username = User's Full Name <email@addr.es>
 
-       and use "User's Full Name <email@addres.org>" as the GIT
+       and use "User's Full Name <email@addr.es>" as the GIT
        author and committer for Subversion commits made by
        "username". If encountering a commit made by a user not in the
        list, abort.

diff --git a/git-svnimport.perl b/git-svnimport.perl
index 75ce8e068a435928d48c78fbed98cd956d5153cf..86837edbdd3392ddbc6815f948132b70c0ae3458 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -74,7 +74,7 @@ if ($opt_A) {
        open(my $authors,$opt_A);
        while(<$authors>) {
                chomp;
-               next unless /^(\S+)\s+(.+?)\s+<(\S+)>$/;
+               next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
                (my $user,my $name,my $email) = ($1,$2,$3);
                $users{$user} = [$name,$email];
        }