mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let git-svnimport's author file use same syntax as git-cvsimport's

Browse Source 
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:
Karl Hasselström
2006-02-28 00:08:15 +01:00
committed by Junio C Hamano
parent 36610b24f1
commit 80804d0af8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-svnimport.txt
View File

@ -75,9 +75,9 @@ When importing incrementally, you might need to edit the .git/svn2git file.
-A <author_file>:: -A <author_file>::
Read a file with lines on the form 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 author and committer for Subversion commits made by
"username". If encountering a commit made by a user not in the "username". If encountering a commit made by a user not in the
list, abort. list, abort.

2
git-svnimport.perl
View File

@ -74,7 +74,7 @@ if ($opt_A) {
open(my $authors,$opt_A); open(my $authors,$opt_A);
while(<$authors>) { while(<$authors>) {
chomp; chomp;
next unless /^(\S+)\s+(.+?)\s+<(\S+)>$/; next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
(my $user,my $name,my $email) = ($1,$2,$3); (my $user,my $name,my $email) = ($1,$2,$3);
$users{$user} = [$name,$email]; $users{$user} = [$name,$email];
} }