git-svn: expand handling of From: and Signed-off-by:

[git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index 54d784469af7b787190e80d277abf2a4782c7d3f..34c5e3d2e4246aeed42d1be89f86c3c20839d509 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2363,11 +2363,20 @@ sub make_log_entry {
 
        my ($commit_name, $commit_email) = ($name, $email);
        if ($_use_log_author) {
-               if ($log_entry{log} =~ /From:\s+(.*?)\s+<(.*)>\s*\n/) {
-                       ($name, $email) = ($1, $2);
-               } elsif ($log_entry{log} =~
-                                     /Signed-off-by:\s+(.*?)\s+<(.*)>\s*\n/) {
+               my $name_field;
+               if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
+                       $name_field = $1;
+               } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
+                       $name_field = $1;
+               }
+               if (!defined $name_field) {
+                       #
+               } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
                        ($name, $email) = ($1, $2);
+               } elsif ($name_field =~ /(.*)@/) {
+                       ($name, $email) = ($1, $name_field);
+               } else {
+                       ($name, $email) = ($name_field, 'unknown');
                }
        }
        if (defined $headrev && $self->use_svm_props) {