From: Junio C Hamano <junkio@cox.net>
Date: Thu, 26 Apr 2007 06:31:45 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc1~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6169a89c4fd29cf9c747bab7bd310877328bc7e2;p=git.git

Merge branch 'maint'

* maint:
  Start preparing for 1.5.1.3
  Sanitize @to recipients.
  git-svn: Ignore usernames in URLs in find_by_url
  Document --dry-run and envelope-sender for git-send-email.
  Allow users to optionally specify their envelope sender.
  Ensure clean addresses are always used with Net::SMTP
  Validate @recipients before using it for sendmail and Net::SMTP.
  Perform correct quoting of recipient names.
  Change the scope of the $cc variable as it is not needed outside of send_message.
  Debugging cleanup improvements
  Prefix Dry- to the message status to denote dry-runs.
  Document --dry-run parameter to send-email.
  git-svn: Don't rely on $_ after making a function call
  Fix handle leak in write_tree
  Actually handle some-low memory conditions

Conflicts:

	RelNotes
	git-send-email.perl
---

6169a89c4fd29cf9c747bab7bd310877328bc7e2
diff --cc git-send-email.perl
index d6b15480d,12ced2888..a6e3e0261
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -441,17 -461,11 +461,14 @@@ sub send_messag
  	    $gitversion = Git::version();
  	}
  
- 	my ($author_name) = ($from =~ /^(.*?)\s+</);
- 	if ($author_name && $author_name =~ /\./ && $author_name !~ /^".*"$/) {
- 		my ($name, $addr) = ($from =~ /^(.*?)(\s+<.*)/);
- 		$from = "\"$name\"$addr";
- 	}
+ 	my $cc = join(", ", unique_email_list(@cc));
 +	my $ccline = "";
 +	if ($cc ne '') {
 +		$ccline = "\nCc: $cc";
 +	}
+ 	$from = sanitize_address_rfc822($from);
  	my $header = "From: $from
 -To: $to
 -Cc: $cc
 +To: $to${ccline}
  Subject: $subject
  Date: $date
  Message-Id: $message_id