From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Oct 2010 05:02:03 +0000 (-0700)
Subject: Merge branch 'sb/send-email-use-to-from-input'
X-Git-Tag: v1.7.4-rc0~161
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8796ff7f3f3de6af48dc38b621f879d95f609bf7;p=git.git

Merge branch 'sb/send-email-use-to-from-input'

* sb/send-email-use-to-from-input:
  send-email: Don't leak To: headers between patches
  send-email: Use To: headers in patch files

Conflicts:
	git-send-email.perl
---

8796ff7f3f3de6af48dc38b621f879d95f609bf7
diff --cc git-send-email.perl
index 196efcd5e,7f9eacd16..f304ef913
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -218,12 -210,10 +218,12 @@@ my %config_bool_settings = 
  my %config_settings = (
      "smtpserver" => \$smtp_server,
      "smtpserverport" => \$smtp_server_port,
 +    "smtpserveroption" => \@smtp_server_options,
      "smtpuser" => \$smtp_authuser,
      "smtppass" => \$smtp_authpass,
 -	"smtpdomain" => \$smtp_domain,
 +    "smtpdomain" => \$smtp_domain,
-     "to" => \@to,
+     "to" => \@initial_to,
 +    "tocmd" => \$to_cmd,
      "cc" => \@initial_cc,
      "cccmd" => \$cc_cmd,
      "aliasfiletype" => \$aliasfiletype,
@@@ -281,8 -271,7 +281,8 @@@ $SIG{INT}  = \&signal_handler
  my $rc = GetOptions("sender|from=s" => \$sender,
                      "in-reply-to=s" => \$initial_reply_to,
  		    "subject=s" => \$initial_subject,
- 		    "to=s" => \@to,
+ 		    "to=s" => \@initial_to,
 +		    "to-cmd=s" => \$to_cmd,
  		    "no-to" => \$no_to,
  		    "cc=s" => \@initial_cc,
  		    "no-cc" => \$no_cc,
@@@ -734,9 -711,9 +734,9 @@@ if (!defined $sender) 
  	$prompting++;
  }
  
- if (!@to && !defined $to_cmd) {
 -if (!@initial_to) {
++if (!@initial_to && !defined $to_cmd) {
  	my $to = ask("Who should the emails be sent to? ");
- 	push @to, parse_address_line($to) if defined $to; # sanitized/validated later
+ 	push @initial_to, parse_address_line($to) if defined $to; # sanitized/validated later
  	$prompting++;
  }