From: Yakov Lerner <iler.ml@gmail.com>
Date: Fri, 25 Sep 2009 22:10:21 +0000 (-0700)
Subject: send-email: fix obscure error when encryption=tls and smtp cannot connect
X-Git-Tag: v1.6.5-rc3~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fb3650ed100a549f80d822f28ccf0f82e9f75f3e;p=git.git

send-email: fix obscure error when encryption=tls and smtp cannot connect

When encryption=tls and we cannot connect to the SMTP server,
git-send-email was printing an obtuse perl error:

  Can't call method "command" on an undefined value
  at git-send-email line 927.

This can occur when smtp host or port is misspelled, or the network
is down, and encryption has been set to tls.

Instead we expect some familiar "Cannot connect to SERVER:PORT"
message.  Fix it to print normal "smtp can't connect" diagnostics.

Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-send-email.perl b/git-send-email.perl
index 0700d80af..dd821f70c 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -921,7 +921,7 @@ X-Mailer: git-send-email $gitversion
 			$smtp ||= Net::SMTP->new((defined $smtp_server_port)
 						 ? "$smtp_server:$smtp_server_port"
 						 : $smtp_server);
-			if ($smtp_encryption eq 'tls') {
+			if ($smtp_encryption eq 'tls' && $smtp) {
 				require Net::SMTP::SSL;
 				$smtp->command('STARTTLS');
 				$smtp->response();