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

* git://bogomips.org/git-svn:
  git-svn: parse authors file more leniently
This commit is contained in:
Junio C Hamano 2015-09-10 14:06:58 -07:00
commit 1962994f08

View file

@ -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;