diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-03 00:30:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-03 00:30:46 +0200 |
| commit | d6873a396e054d814744f8943fd1c343ecf4a9dc (patch) | |
| tree | 38e3639a96d56e88ab6276723574724c4fb2594b /git-send-email.perl | |
| parent | Merge branch 'bc/sequencer-export-work-tree-as-well' (diff) | |
| parent | send-email: fix tls AUTH when sending batch (diff) | |
| download | git-d6873a396e054d814744f8943fd1c343ecf4a9dc.tar.xz git-d6873a396e054d814744f8943fd1c343ecf4a9dc.zip | |
Merge branch 'jm/send-email-tls-auth-on-batch'
"git send-email" when using in a batched mode that limits the
number of messages sent in a single SMTP session lost the contents
of the variable used to choose between tls/ssl, unable to send the
second and later batches, which has been fixed.
* jm/send-email-tls-auth-on-batch:
send-email: fix tls AUTH when sending batch
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index f4c07908d2..2be5dac337 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1479,7 +1479,7 @@ EOF SSL => 1); } } - else { + elsif (!$smtp) { $smtp_server_port ||= 25; $smtp ||= Net::SMTP->new($smtp_server, Hello => $smtp_domain, @@ -1501,7 +1501,6 @@ EOF $smtp->starttls(ssl_verify_params()) or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr()); } - $smtp_encryption = ''; # Send EHLO again to receive fresh # supported commands $smtp->hello($smtp_domain); |