diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-10 14:06:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-10 14:06:58 -0700 |
| commit | 1962994f08e7a193998fd0319f02109ed0153447 (patch) | |
| tree | 178d4a8fbd1d4d7ba72618554b1c0a63c3c8e38d | |
| parent | f0bc85462332644ecd2386e0f4fdc9948b9f47dc (diff) | |
| parent | f7c6de0ea1bd5722a1181c6279676c6831b38a34 (diff) | |
| download | git-1962994f08e7a193998fd0319f02109ed0153447.tar.gz | |
Merge git://bogomips.org/git-svn
* git://bogomips.org/git-svn:
git-svn: parse authors file more leniently
| -rwxr-xr-x | git-svn.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index 36f7240c99..fa5f253065 100755 --- 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; |