From 80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karl=20=20Hasselstr=C3=B6m?= Date: Tue, 28 Feb 2006 00:08:15 +0100 Subject: [PATCH] Let git-svnimport's author file use same syntax as git-cvsimport's MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- 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 e0e3a5d4..912a8086 100644 --- 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 :: 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 75ce8e06..86837edb 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]; } -- 2.11.0