diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 21:29:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 21:29:57 (GMT) |
| commit | b29dc5c671150ff0c4afa41cdd8fec9c86ffe6eb (patch) | |
| tree | 7a63fd518c80fbc2114a405d61293fff7eb4d9ad /git-send-email.perl | |
| parent | 833cd7fc9fed8568a3612e9b1b204290b0f0e15d (diff) | |
| parent | 4cb46bddeb7d21241f8ac5e46eb3d1cee468ea14 (diff) | |
| download | git-b29dc5c671150ff0c4afa41cdd8fec9c86ffe6eb.zip git-b29dc5c671150ff0c4afa41cdd8fec9c86ffe6eb.tar.gz git-b29dc5c671150ff0c4afa41cdd8fec9c86ffe6eb.tar.bz2 | |
Merge branch 'mt/send-email-cc-match-fix'
Logic used by git-send-email to suppress cc mishandled names that
need RFC2047 quoting.
* mt/send-email-cc-match-fix:
send-email: sanitize author when writing From line
send-email: add test for duplicate utf8 name
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 671762b..ecbf56f 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1259,6 +1259,7 @@ foreach my $t (@files) { open my $fh, "<", $t or die "can't open file $t"; my $author = undef; + my $sauthor = undef; my $author_encoding; my $has_content_type; my $body_encoding; @@ -1297,7 +1298,7 @@ foreach my $t (@files) { } elsif (/^From:\s+(.*)$/i) { ($author, $author_encoding) = unquote_rfc2047($1); - my $sauthor = sanitize_address($author); + $sauthor = sanitize_address($author); next if $suppress_cc{'author'}; next if $suppress_cc{'self'} and $sauthor eq $sender; printf("(mbox) Adding cc: %s from line '%s'\n", @@ -1393,7 +1394,7 @@ foreach my $t (@files) { $subject = quote_subject($subject, $auto_8bit_encoding); } - if (defined $author and $author ne $sender) { + if (defined $sauthor and $sauthor ne $sender) { $message = "From: $author\n\n$message"; if (defined $author_encoding) { if ($has_content_type) { |