Skip to content

Commit

Permalink
Merge branch 'ew/send-email-readable-message-id'
Browse files Browse the repository at this point in the history
"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
  • Loading branch information
gitster committed Apr 22, 2016
2 parents deef3cd + f916ab0 commit 18dff3d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions git-send-email.perl
Expand Up @@ -19,6 +19,7 @@
use 5.008;
use strict;
use warnings;
use POSIX qw/strftime/;
use Term::ReadLine;
use Getopt::Long;
use Text::ParseWords;
Expand Down Expand Up @@ -949,7 +950,7 @@ sub validate_address_list {
sub make_message_id {
my $uniq;
if (!defined $message_id_stamp) {
$message_id_stamp = sprintf("%s-%s", time, $$);
$message_id_stamp = strftime("%Y%m%d%H%M%S.$$", gmtime(time));
$message_id_serial = 0;
}
$message_id_serial++;
Expand All @@ -964,7 +965,7 @@ sub make_message_id {
require Sys::Hostname;
$du_part = 'user@' . Sys::Hostname::hostname();
}
my $message_id_template = "<%s-git-send-email-%s>";
my $message_id_template = "<%s-%s>";
$message_id = sprintf($message_id_template, $uniq, $du_part);
#print "new message id = $message_id\n"; # Was useful for debugging
}
Expand Down

0 comments on commit 18dff3d

Please sign in to comment.