From: Karl Hasselström Date: Mon, 27 Feb 2006 23:08:15 GMT Subject: [PATCH 1/2] Let git-svnimport's author file use same syntax as git-cvsimport's Message-ID: <20060227230814.12298.63006.stgit@backpacker.hemma.treskal.com> In-Reply-To: <440195D4.7080905@op5.se> git-cvsimport uses a username => Full Name mapping file with this syntax: kha=Karl Hasselström Since there is no reason to use another format for git-svnimport, use the same format. Signed-off-by: Karl Hasselström --- Documentation/git-svnimport.txt | 4 ++-- git-svnimport.perl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index e0e3a5d..912a808 100644 --- a/Documentation/git-svnimport.txt +++ b/Documentation/git-svnimport.txt @@ -75,9 +75,9 @@ When importing incrementally, you might -A :: Read a file with lines on the form - username User's Full Name + username = User's Full Name - and use "User's Full Name " as the GIT + and use "User's Full Name " 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 75ce8e0..86837ed 100755 --- 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]; }