mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-send-email: Do not make @-less message ID

Browse Source 
When the original $from address fails to yield a valid-looking
e-mail address, we created a bogus looking message ID, formatted
like this:

	Message-Id: <11823357623688-git-send-email->

This commit fixes it by moving call to make_message_id() to
where it matters, namely, before the $message_id is needed to be
placed in the generated e-mail header; this has an important
side effect of making it clear that $from is already available.

Also throw in Sys::Hostname::hostname() just for fun, although I
suspect that the code would never trigger due to the modified
call sequence that makes sure $from is always available.  This
is based on a suggestion by Michael Hendricks.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2007-06-20 13:47:34 -07:00
parent 0d351e9ca2
commit aeb5932845
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
git-send-email.perl
View File

@ -412,13 +412,21 @@ sub extract_valid_address {
# 1 second since the last time we were called. # 1 second since the last time we were called.
# We'll setup a template for the message id, using the "from" address: # We'll setup a template for the message id, using the "from" address:
my $message_id_from = extract_valid_address($from);
my $message_id_template = "<%s-git-send-email-$message_id_from>";
sub make_message_id sub make_message_id
{ {
my $date = time; my $date = time;
my $pseudo_rand = int (rand(4200)); my $pseudo_rand = int (rand(4200));
my $du_part;
for ($from, $committer, $author) {
$du_part = extract_valid_address($_);
last if ($du_part ne '');
}
if ($du_part eq '') {
use Sys::Hostname qw();
$du_part = 'user@' . Sys::Hostname::hostname();
}
my $message_id_template = "<%s-git-send-email-$du_part>";
$message_id = sprintf $message_id_template, "$date$pseudo_rand"; $message_id = sprintf $message_id_template, "$date$pseudo_rand";
#print "new message id = $message_id\n"; # Was useful for debugging #print "new message id = $message_id\n"; # Was useful for debugging
} }
@ -467,6 +475,8 @@ sub send_message
$ccline = "\nCc: $cc"; $ccline = "\nCc: $cc";
} }
$from = sanitize_address_rfc822($from); $from = sanitize_address_rfc822($from);
make_message_id();
my $header = "From: $from my $header = "From: $from
To: $to${ccline} To: $to${ccline}
Subject: $subject Subject: $subject
@ -533,7 +543,6 @@ X-Mailer: git-send-email $gitversion
$reply_to = $initial_reply_to; $reply_to = $initial_reply_to;
$references = $initial_reply_to || ''; $references = $initial_reply_to || '';
make_message_id();
$subject = $initial_subject; $subject = $initial_subject;
foreach my $t (@files) { foreach my $t (@files) {
@ -627,7 +636,6 @@ foreach my $t (@files) {
$references = "$message_id"; $references = "$message_id";
} }
} }
make_message_id();
} }
if ($compose) { if ($compose) {