Merge git://bogomips.org/git-svn

* git://bogomips.org/git-svn: git-svn: parse authors file more leniently
git-mirror · Sep 10, 2015 · 1962994 · 1962994
2 parents f0bc854 + f7c6de0
commit 1962994
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-svn.perl b/git-svn.perl
@@ -1924,7 +1924,7 @@ sub load_authors {
 	my $log = $cmd eq 'log';
 	while (<$authors>) {
 		chomp;
-		next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
+		next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/;
 		my ($user, $name, $email) = ($1, $2, $3);
 		if ($log) {
 			$Git::SVN::Log::rusers{"$name <$email>"} = $user;