X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-send-email.perl;h=ed1d89b3f73564715d0fe4061e87f63fea7e7be2;hb=dd8239f997962d94162790039b008acb6068a242;hp=d418d6c5d2230fde2e201d31ff82dc5e26e79a9a;hpb=8baf06a03aa2a4554079a2f722af1751f1654ce8;p=git.git

diff --git a/git-send-email.perl b/git-send-email.perl
index d418d6c5..ed1d89b3 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -21,7 +21,6 @@ use warnings;
 use Term::ReadLine;
 use Getopt::Long;
 use Data::Dumper;
-use Net::SMTP;
 
 # most mail servers generate the Date: header, but not all...
 $ENV{LC_ALL} = 'C';
@@ -387,11 +386,14 @@ X-Mailer: git-send-email $gitversion
 		my $pid = open my $sm, '|-';
 		defined $pid or die $!;
 		if (!$pid) {
-			exec($smtp_server,'-i',@recipients) or die $!;
+			exec($smtp_server,'-i',
+			     map { scalar extract_valid_address($_) }
+			     @recipients) or die $!;
 		}
 		print $sm "$header\n$message";
 		close $sm or die $?;
 	} else {
+		require Net::SMTP;
 		$smtp ||= Net::SMTP->new( $smtp_server );
 		$smtp->mail( $from ) or die $smtp->message;
 		$smtp->to( @recipients ) or die $smtp->message;
@@ -420,7 +422,7 @@ X-Mailer: git-send-email $gitversion
 }
 
 $reply_to = $initial_reply_to;
-$references = $initial_reply_to;
+$references = $initial_reply_to || '';
 make_message_id();
 $subject = $initial_subject;