Skip to content

Commit 18dff3d

Browse files
committed
Merge branch 'ew/send-email-readable-message-id'
"git send-email" now uses a more readable timestamps when formulating a message ID. * ew/send-email-readable-message-id: send-email: more meaningful Message-ID
2 parents deef3cd + f916ab0 commit 18dff3d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

git-send-email.perl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use 5.008;
2020
use strict;
2121
use warnings;
22+
use POSIX qw/strftime/;
2223
use Term::ReadLine;
2324
use Getopt::Long;
2425
use Text::ParseWords;
@@ -949,7 +950,7 @@ sub validate_address_list {
949950
sub make_message_id {
950951
my $uniq;
951952
if (!defined $message_id_stamp) {
952-
$message_id_stamp = sprintf("%s-%s", time, $$);
953+
$message_id_stamp = strftime("%Y%m%d%H%M%S.$$", gmtime(time));
953954
$message_id_serial = 0;
954955
}
955956
$message_id_serial++;
@@ -964,7 +965,7 @@ sub make_message_id {
964965
require Sys::Hostname;
965966
$du_part = 'user@' . Sys::Hostname::hostname();
966967
}
967-
my $message_id_template = "<%s-git-send-email-%s>";
968+
my $message_id_template = "<%s-%s>";
968969
$message_id = sprintf($message_id_template, $uniq, $du_part);
969970
#print "new message id = $message_id\n"; # Was useful for debugging
970971
}

0 commit comments

Comments
 (0)