git-svn: expand handling of From: and Signed-off-by:
The current parsing for From: and Signed-off-by: lines handles fully specified names:
From: Full Name <email@address>
Expand this to include the raw email addresses and straight "names":
From: email@address -> email <email@address> From: Full Name -> Full Name <unknown>
Signed-off-by Andy Whitcroft <[email protected]>
--- git-svn.perl | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-)
git-svn.perl +13 -4
@@ -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) {
Eric Wong
Acked-byQuoted 11 lines · Andy Whitcroft
The current parsing for From: and Signed-off-by: lines handles fully specified names:
From: Full Name <email@address>
Expand this to include the raw email addresses and straight "names":
From: email@address -> email <email@address> From: Full Name -> Full Name <unknown>Signed-off-by Andy Whitcroft <[email protected]>
Some minor whitespace damage (which Junio can fix up), but
Acked-by Eric Wong <[email protected]>
Thanks Andy.
Quoted 16 lines
--- git-svn.perl | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-)git-svn.perl +1
-4@@ -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;
git-svn.perl sub make_log_entry { · line 2376
Quoted 10 lines
git-svn.perl +9
-0+ 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 =~ /(.*)@/) {
^ spaces before tab here
Quoted 6 lines
git-svn.perl +3
-0+ ($name, $email) = ($1, $name_field); + } else { + ($name, $email) = ($name_field, 'unknown'); } } if (defined $headrev && $self->use_svm_props) {
Signature · 1 line
Eric Wong
Junio C Hamano
AppliedQuoted 4 lines · Eric Wong
Some minor whitespace damage (which Junio can fix up), but
Acked-by Eric Wong <[email protected]>Thanks Andy.
Thanks, applied.