Skip to content

Commit

Permalink
git-svn: expand handling of From: and Signed-off-by:
Browse files Browse the repository at this point in the history
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 <apw@shadowen.org>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Andy Whitcroft authored and Junio C Hamano committed Dec 13, 2007
1 parent 9e5d87d commit 5ff6aae
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 5ff6aae

Please sign in to comment.