summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Hasselström <kha@treskal.com>2006-02-27 23:08:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-27 23:27:21 (GMT)
commit80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40 (patch)
tree5ca2f39c4cc5e006e28ea8c409c24467adf3a445
parent36610b24f1a1821eee95243663631c1295c202ed (diff)
downloadgit-80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40.zip
git-80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40.tar.gz
git-80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40.tar.bz2
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>
-rw-r--r--Documentation/git-svnimport.txt4
-rwxr-xr-xgit-svnimport.perl2
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 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 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];
}