Skip to content

Commit

Permalink
git-send-email.perl: add option --smtp-debug
Browse files Browse the repository at this point in the history
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jari Aalto authored and Junio C Hamano committed Mar 14, 2010
1 parent e5afb3a commit f60812e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions git-send-email.perl
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ sub usage {
--smtp-pass <str> * Password for SMTP-AUTH; not necessary.
--smtp-encryption <str> * tls or ssl; anything else disables.
--smtp-ssl * Deprecated. Use '--smtp-encryption ssl'.
--smtp-debug <0|1> * Disable, enable Net::SMTP debug.
Automating:
--identity <str> * Use the sendemail.<id> options.
Expand Down Expand Up @@ -187,6 +188,8 @@ sub do_edit {
my ($validate, $confirm);
my (@suppress_cc);

my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()

my $not_set_by_user = "true but not set by the user";

my %config_bool_settings = (
Expand Down Expand Up @@ -270,6 +273,7 @@ sub signal_handler {
"smtp-pass:s" => \$smtp_authpass,
"smtp-ssl" => sub { $smtp_encryption = 'ssl' },
"smtp-encryption=s" => \$smtp_encryption,
"smtp-debug:i" => \$debug_net_smtp,
"identity=s" => \$identity,
"annotate" => \$annotate,
"compose" => \$compose,
Expand Down Expand Up @@ -938,7 +942,8 @@ sub send_message
require Net::SMTP;
$smtp ||= Net::SMTP->new((defined $smtp_server_port)
? "$smtp_server:$smtp_server_port"
: $smtp_server);
: $smtp_server,
Debug => $debug_net_smtp);
if ($smtp_encryption eq 'tls' && $smtp) {
require Net::SMTP::SSL;
$smtp->command('STARTTLS');
Expand All @@ -957,7 +962,7 @@ sub send_message
}

if (!$smtp) {
die "Unable to initialize SMTP properly. Check config. ",
die "Unable to initialize SMTP properly. Check config and use --smtp-debug. ",
"VALUES: server=$smtp_server ",
"encryption=$smtp_encryption ",
defined $smtp_server_port ? "port=$smtp_server_port" : "";
Expand Down

0 comments on commit f60812e

Please sign in to comment.