Apply mailmap in git-blame output.

diff --git a/git-send-email.perl b/git-send-email.perl
index 56c2936f272bb51ee476d55c4a8cfa8344f713c5..a6e3e026199a8d5ce763360c60ee0491f14820a5 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -274,6 +274,7 @@ sub expand_aliases {
 }
 
 @to = expand_aliases(@to);
+@to = (map { sanitize_address_rfc822($_) } @to);
 @initial_cc = expand_aliases(@initial_cc);
 @bcclist = expand_aliases(@bcclist);
 
@@ -461,10 +462,13 @@ sub send_message
        }
 
        my $cc = join(", ", unique_email_list(@cc));
+       my $ccline = "";
+       if ($cc ne '') {
+               $ccline = "\nCc: $cc";
+       }
        $from = sanitize_address_rfc822($from);
        my $header = "From: $from
-To: $to
-Cc: $cc
+To: $to${ccline}
 Subject: $subject
 Date: $date
 Message-Id: $message_id