Skip to content

Commit

Permalink
Let git-svnimport's author file use same syntax as git-cvsimport's
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Karl Hasselström authored and Junio C Hamano committed Feb 27, 2006
1 parent 36610b2 commit 80804d0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-svnimport.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion git-svnimport.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
Expand Down

0 comments on commit 80804d0

Please sign in to comment.