mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'sa/send-email-dedup-some-headers'
When fed input that already has In-Reply-To: and/or References: headers and told to add the same information, "git send-email" added these headers separately, instead of appending to an existing one, which is a violation of the RFC. This has been corrected. * sa/send-email-dedup-some-headers: send-email: avoid duplicate In-Reply-To/References
This commit is contained in:
commit
c50f76aa9d
|
@ -1642,10 +1642,15 @@ sub send_message {
|
|||
elsif (/^Content-Transfer-Encoding: (.*)/i) {
|
||||
$xfer_encoding = $1 if not defined $xfer_encoding;
|
||||
}
|
||||
elsif (/^In-Reply-To: (.*)/i) {
|
||||
$in_reply_to = $1;
|
||||
}
|
||||
elsif (/^References: (.*)/i) {
|
||||
$references = $1;
|
||||
}
|
||||
elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {
|
||||
push @xh, $_;
|
||||
}
|
||||
|
||||
} else {
|
||||
# In the traditional
|
||||
# "send lots of email" format,
|
||||
|
|
Loading…
Reference in a new issue