1 files changed, 6 insertions, 5 deletions

diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index d29a8d75cb2..4594f334105 100755
--- 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)
-        if (/^(.+)<(.+)>$/) {
+
+        if (/^([^<]+)<([^>]+)>$/) {
             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;
 
-        } elsif (/^<([^\s]+)>\s*<([^\s]+)>$/) {
+        } elsif (/^<([^>]+)>\s*<([^>]+)>$/) {
             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;
@@ -353,7 +354,7 @@ sub read_mailmap {
             $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;
@@ -1388,7 +1389,7 @@ sub vcs_exists {
         warn("$P: No supported VCS found.  Add --nogit to options?\n");
         warn("Using a git repository produces better results.\n");
         warn("Try Linus Torvalds' latest git repository using:\n");
-        warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n");
+        warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n");
         $printed_novcs = 1;
     }
     return 0;