undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-send-email: avoid duplicate message-ids

Browse Source 
We used to unconditionally add a message-id to the outgoing
email without bothering to check if it already had one.
Instead, let's use the existing one.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2007-12-17 15:51:34 -05:00 committed by Junio C Hamano
parent 6851162adf
commit 4f3d37035a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-send-email.perl
View File

@ -527,7 +527,7 @@ sub send_message
$ccline = "\nCc: $cc"; $ccline = "\nCc: $cc";
} }
my $sanitized_sender = sanitize_address($sender); my $sanitized_sender = sanitize_address($sender);
make_message_id(); make_message_id() unless defined($message_id);
my $header = "From: $sanitized_sender my $header = "From: $sanitized_sender
To: $to${ccline} To: $to${ccline}
@ -643,6 +643,9 @@ foreach my $t (@files) {
} }
push @xh, $_; push @xh, $_;
} }
elsif (/^Message-Id: (.*)/i) {
$message_id = $1;
}
elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) { elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) {
push @xh, $_; push @xh, $_;
} }
@ -728,6 +731,7 @@ foreach my $t (@files) {
$references = "$message_id"; $references = "$message_id";
} }
} }
$message_id = undef;
} }
if ($compose) { if ($compose) {