summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-01 16:12:19 -0700
committerJunio C Hamano <gitster@pobox.com>2011-11-01 16:12:19 -0700
commitac7acaa5d98077f7cf900461d5d7ddfebdcc08d3 (patch)
tree8f6706cb339376d24c47b86f08603dc9de3119a7
parent0814d6e554c45636f41856cc2204abe2f661560c (diff)
parent155b940f7a117e9bba1b62e442c9e6e5853a3c0d (diff)
downloadgit-ac7acaa5d98077f7cf900461d5d7ddfebdcc08d3.tar.gz
Merge branch 'md/smtp-tls-hello-again' into maint
* md/smtp-tls-hello-again: send-email: Honour SMTP domain when using TLS
-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 98ab33aae7..5790744ae3 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1079,7 +1079,7 @@ X-Mailer: git-send-email $gitversion
$smtp_encryption = '';
# Send EHLO again to receive fresh
# supported commands
- $smtp->hello();
+ $smtp->hello($smtp_domain);
} else {
die "Server does not support STARTTLS! ".$smtp->message;
}