projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[firefly-linux-kernel-4.4.55.git]
/
scripts
/
get_maintainer.pl
diff --git
a/scripts/get_maintainer.pl
b/scripts/get_maintainer.pl
index d29a8d75cb22ebb37f747f1b0b46d5df24974e58..eb2f1e64edf79b63069fc53399ce71d759ae8795 100755
(executable)
--- a/
scripts/get_maintainer.pl
+++ b/
scripts/get_maintainer.pl
@@
-328,7
+328,8
@@
sub read_mailmap {
# name1 <mail1> <mail2>
# name1 <mail1> name2 <mail2>
# (see man git-shortlog)
# name1 <mail1> <mail2>
# name1 <mail1> name2 <mail2>
# (see man git-shortlog)
- if (/^(.+)<(.+)>$/) {
+
+ if (/^([^<]+)<([^>]+)>$/) {
my $real_name = $1;
my $address = $2;
my $real_name = $1;
my $address = $2;
@@
-336,13
+337,13
@@
sub read_mailmap {
($real_name, $address) = parse_email("$real_name <$address>");
$mailmap->{names}->{$address} = $real_name;
($real_name, $address) = parse_email("$real_name <$address>");
$mailmap->{names}->{$address} = $real_name;
- } elsif (/^<([^
\s]+)>\s*<([^\s
]+)>$/) {
+ } elsif (/^<([^
>]+)>\s*<([^>
]+)>$/) {
my $real_address = $1;
my $wrong_address = $2;
$mailmap->{addresses}->{$wrong_address} = $real_address;
my $real_address = $1;
my $wrong_address = $2;
$mailmap->{addresses}->{$wrong_address} = $real_address;
- } elsif (/^(.+)<([^
\s]+)>\s*<([^\s
]+)>$/) {
+ } elsif (/^(.+)<([^
>]+)>\s*<([^>
]+)>$/) {
my $real_name = $1;
my $real_address = $2;
my $wrong_address = $3;
my $real_name = $1;
my $real_address = $2;
my $wrong_address = $3;
@@
-353,7
+354,7
@@
sub read_mailmap {
$mailmap->{names}->{$wrong_address} = $real_name;
$mailmap->{addresses}->{$wrong_address} = $real_address;
$mailmap->{names}->{$wrong_address} = $real_name;
$mailmap->{addresses}->{$wrong_address} = $real_address;
- } elsif (/^(.+)<([^
\s]+)>\s*([^\s].*)<([^\s
]+)>$/) {
+ } elsif (/^(.+)<([^
>]+)>\s*(.+)\s*<([^>
]+)>$/) {
my $real_name = $1;
my $real_address = $2;
my $wrong_name = $3;
my $real_name = $1;
my $real_address = $2;
my $wrong_name = $3;