summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-06-20 13:47:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-06-24 02:46:35 -0700
commitaeb59328453cd4f438345ea79ff04c96bccbbbb8 (patch)
tree9c8bd0af624beca5703234ad8741aeec39bd0ac5 /builtin-merge-file.c
parentgit-svn: trailing slash in prefix is mandatory with --branches/-b (diff)
downloadtgif-aeb59328453cd4f438345ea79ff04c96bccbbbb8.tar.xz
git-send-email: Do not make @-less message ID
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>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions