From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 23:55:32 +0000 (-0800)
Subject: Merge branch 'ao/send-email-irt'
X-Git-Tag: v1.7.4-rc0~118
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01530432f73e7a29fbb9c4bc62aa88fba125ca7d;hp=-c;p=git.git

Merge branch 'ao/send-email-irt'

* ao/send-email-irt:
  git-send-email.perl: make initial In-Reply-To apply only to first email
  t9001: send-email interation with --in-reply-to and --chain-reply-to
---

01530432f73e7a29fbb9c4bc62aa88fba125ca7d
diff --combined git-send-email.perl
index 6e2d79ac6,fe6b8485c..76565de2e
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -960,7 -960,7 +960,7 @@@ sub maildomain 
  sub send_message {
  	my @recipients = unique_email_list(@to);
  	@cc = (grep { my $cc = extract_valid_address($_);
 -		      not grep { $cc eq $_ } @recipients
 +		      not grep { $cc eq $_ || $_ =~ /<\Q${cc}\E>$/ } @recipients
  		    }
  	       map { sanitize_address($_) }
  	       @cc);
@@@ -1319,7 -1319,8 +1319,8 @@@ foreach my $t (@files) 
  
  	# set up for the next message
  	if ($thread && $message_was_sent &&
- 		(chain_reply_to() || !defined $reply_to || length($reply_to) == 0)) {
+ 		(chain_reply_to() || !defined $reply_to || length($reply_to) == 0 ||
+ 		$message_num == 1)) {
  		$reply_to = $message_id;
  		if (length $references > 0) {
  			$references .= "\n $message_id";