summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-12 16:23:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-12 16:23:43 (GMT)
commit95a877a34c3838a92a99794ebc3b082f6f525899 (patch)
treebcd7961c64ef7d319e75b7dc320235881efd1e69 /git-send-email.perl
parenta1b5b371994beb044053da22ec4a9607630a83a2 (diff)
parent0fd41f2d66fdb7c8125f341c72f075aca045017f (diff)
downloadgit-95a877a34c3838a92a99794ebc3b082f6f525899.zip
git-95a877a34c3838a92a99794ebc3b082f6f525899.tar.gz
git-95a877a34c3838a92a99794ebc3b082f6f525899.tar.bz2
Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threaded
* mh/maint-fix-send-email-threaded: 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 Conflicts: git-send-email.perl t/t9001-send-email.sh
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 4a77d44..303e03a 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1150,7 +1150,7 @@ foreach my $t (@files) {
my $message_was_sent = send_message();
# set up for the next message
- if ($message_was_sent &&
+ if ($thread && $message_was_sent &&
($chain_reply_to || !defined $reply_to || length($reply_to) == 0)) {
$reply_to = $message_id;
if (length $references > 0) {