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

kwiberg · Junio C Hamano · commit 80804d0af8f5 · 2006-02-27T15:27:21.000-08:00
git-cvsimport uses a username =&gt; Full Name &lt;email@addr.es&gt; mapping
file with this syntax:

  kha=Karl Hasselström &lt;kha@treskal.com&gt;

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

Signed-off-by: Karl Hasselström &lt;kha@treskal.com&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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
@@ -74,7 +74,7 @@ END
 	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];
 	}

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ END`
`74`	`74`	`open(my $authors,$opt_A);`
`75`	`75`	`while(<$authors>) {`
`76`	`76`	`chomp;`
`77`		`- next unless /^(\S+)\s+(.+?)\s+<(\S+)>$/;`
	`77`	`+ next unless /^(\S+?)\s=\s(.+?)\s<(.+)>\s$/;`
`78`	`78`	`(my $user,my $name,my $email) = ($1,$2,$3);`
`79`	`79`	`$users{$user} = [$name,$email];`
`80`	`80`	`}`