diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:55:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:55:50 -0700 |
| commit | 08ba24898a1c5c0815450d481d8e5d01bf671642 (patch) | |
| tree | 9b06143e91f1ef45194210066e955863f0ea12ad /git-send-email.perl | |
| parent | e2486193c54e5404bad1748d220f58a414867797 (diff) | |
| parent | 95a877a34c3838a92a99794ebc3b082f6f525899 (diff) | |
| download | git-08ba24898a1c5c0815450d481d8e5d01bf671642.tar.gz | |
Merge branch 'mh/fix-send-email-threaded'
* mh/fix-send-email-threaded:
send-email: fix a typo in a comment
send-email: fix threaded mails without chain-reply-to
add a test for git-send-email for threaded mails without chain-reply-to
doc/send-email: clarify the behavior of --in-reply-to with --no-thread
send-email: fix non-threaded mails
add a test for git-send-email for non-threaded mails
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 4c795a4b03..303e03a8ce 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -812,7 +812,7 @@ sub sanitize_address } # Returns 1 if the message was sent, and 0 otherwise. -# In actuality, the whole program dies when a there +# In actuality, the whole program dies when there # is an error sending a message. sub send_message @@ -1150,7 +1150,8 @@ foreach my $t (@files) { my $message_was_sent = send_message(); # set up for the next message - if ($message_was_sent and $chain_reply_to || not defined $reply_to || length($reply_to) == 0) { + if ($thread && $message_was_sent && + ($chain_reply_to || !defined $reply_to || length($reply_to) == 0)) { $reply_to = $message_id; if (length $references > 0) { $references .= "\n $message_id"; |