mirror of
https://github.com/git/git.git
synced 2025-04-03 02:10:08 +00:00
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>
This commit is contained in:
parent
36610b24f1
commit
80804d0af8
@ -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.
|
||||
|
@ -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];
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user