summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-02 06:05:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-02 06:05:59 (GMT)
commitb85b88141ea102638cd532813767e6f9484b1498 (patch)
treea3e521d48f003384667a1b114692adc4ba79b196 /git-send-email.perl
parent7d26aa32309a2a5979c4ae4b85b25b20e8aae0d4 (diff)
parentbfbfc9a953d8e26b029110c05581b22f9f0d77e9 (diff)
downloadgit-b85b88141ea102638cd532813767e6f9484b1498.zip
git-b85b88141ea102638cd532813767e6f9484b1498.tar.gz
git-b85b88141ea102638cd532813767e6f9484b1498.tar.bz2
Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able'
A hotfix to a topic in 'master'. * dk/send-email-avoid-net-smtp-ssl-when-able: send-email: Net::SMTP::starttls was introduced in v2.34
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index f0417f6..0168a47 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1355,7 +1355,7 @@ EOF
}
require Net::SMTP;
- my $use_net_smtp_ssl = version->parse($Net::SMTP::VERSION) < version->parse("1.28");
+ my $use_net_smtp_ssl = version->parse($Net::SMTP::VERSION) < version->parse("2.34");
$smtp_domain ||= maildomain();
if ($smtp_encryption eq 'ssl') {