Skip to content

Commit 1962994

Browse files
committed
Merge git://bogomips.org/git-svn
* git://bogomips.org/git-svn: git-svn: parse authors file more leniently
2 parents f0bc854 + f7c6de0 commit 1962994

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-svn.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,7 @@ sub load_authors {
19241924
my $log = $cmd eq 'log';
19251925
while (<$authors>) {
19261926
chomp;
1927-
next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
1927+
next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/;
19281928
my ($user, $name, $email) = ($1, $2, $3);
19291929
if ($log) {
19301930
$Git::SVN::Log::rusers{"$name <$email>"} = $user;

0 commit comments

Comments
 (0)