diff options
| -rw-r--r-- | Documentation/git-svnimport.txt | 4 | ||||
| -rwxr-xr-x | git-svnimport.perl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index e0e3a5d4e8..912a80865e 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 75ce8e068a..86837edbdd 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]; } |