projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git-mv fixes from 'maint'
[git.git]
/
git-svnimport.perl
diff --git
a/git-svnimport.perl
b/git-svnimport.perl
index
75ce8e0
..
86837ed
100755
(executable)
--- 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];
}