From fb3650ed100a549f80d822f28ccf0f82e9f75f3e Mon Sep 17 00:00:00 2001 From: Yakov Lerner Date: Fri, 25 Sep 2009 15:10:21 -0700 Subject: [PATCH] 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 Signed-off-by: Shawn O. Pearce --- git-send-email.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-send-email.perl b/git-send-email.perl index 0700d80afc..dd821f70cd 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(); -- 2.11.4.GIT