@matheusbsbs / matheus-bagliano / commits / 80804d0af8
Fork 0

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>

Karl Hasselström committed Feb 28, 2006 at 00:08 UTC 80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40
2 files changed +3 -3
Documentation/git-svnimport.txt
+2 -2
@@ -75,9 +75,9 @@ When importing incrementally, you might need to edit the .git/svn2git file.
75 -A <author_file>::
76 Read a file with lines on the form
77
78 - username User's Full Name <email@addres.org>
78 + username = User's Full Name <email@addr.es>
79
80 - and use "User's Full Name <email@addres.org>" as the GIT
80 + and use "User's Full Name <email@addr.es>" as the GIT
81 author and committer for Subversion commits made by
82 "username". If encountering a commit made by a user not in the
83 list, abort.
git-svnimport.perl
+1 -1
@@ -74,7 +74,7 @@ if ($opt_A) {
74 open(my $authors,$opt_A);
75 while(<$authors>) {
76 chomp;
77 - next unless /^(\S+)\s+(.+?)\s+<(\S+)>$/;
77 + next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
78 (my $user,my $name,my $email) = ($1,$2,$3);
79 $users{$user} = [$name,$email];
80 }