mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-send-email.perl: add option --smtp-debug

Browse Source 
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jari Aalto
2010-03-14 17:16:09 +02:00
committed by Junio C Hamano
parent e5afb3a6f9
commit f60812efa3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
git-send-email.perl
View File

@ -64,6 +64,7 @@ git send-email [options] <file | directory | rev-list options >
--smtp-pass <str> * Password for SMTP-AUTH; not necessary. --smtp-pass <str> * Password for SMTP-AUTH; not necessary.
--smtp-encryption <str> * tls or ssl; anything else disables. --smtp-encryption <str> * tls or ssl; anything else disables.
--smtp-ssl * Deprecated. Use '--smtp-encryption ssl'. --smtp-ssl * Deprecated. Use '--smtp-encryption ssl'.
--smtp-debug <0|1> * Disable, enable Net::SMTP debug.
Automating: Automating:
--identity <str> * Use the sendemail.<id> options. --identity <str> * Use the sendemail.<id> options.
@ -187,6 +188,8 @@ my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts);
my ($validate, $confirm); my ($validate, $confirm);
my (@suppress_cc); 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 $not_set_by_user = "true but not set by the user";
my %config_bool_settings = ( my %config_bool_settings = (
@ -270,6 +273,7 @@ my $rc = GetOptions("sender|from=s" => \$sender,
"smtp-pass:s" => \$smtp_authpass, "smtp-pass:s" => \$smtp_authpass,
"smtp-ssl" => sub { $smtp_encryption = 'ssl' }, "smtp-ssl" => sub { $smtp_encryption = 'ssl' },
"smtp-encryption=s" => \$smtp_encryption, "smtp-encryption=s" => \$smtp_encryption,
"smtp-debug:i" => \$debug_net_smtp,
"identity=s" => \$identity, "identity=s" => \$identity,
"annotate" => \$annotate, "annotate" => \$annotate,
"compose" => \$compose, "compose" => \$compose,
@ -938,7 +942,8 @@ X-Mailer: git-send-email $gitversion
require Net::SMTP; require Net::SMTP;
$smtp ||= Net::SMTP->new((defined $smtp_server_port) $smtp ||= Net::SMTP->new((defined $smtp_server_port)
? "$smtp_server:$smtp_server_port" ? "$smtp_server:$smtp_server_port"
: $smtp_server); : $smtp_server,
Debug => $debug_net_smtp);
if ($smtp_encryption eq 'tls' && $smtp) { if ($smtp_encryption eq 'tls' && $smtp) {
require Net::SMTP::SSL; require Net::SMTP::SSL;
$smtp->command('STARTTLS'); $smtp->command('STARTTLS');
@ -957,7 +962,7 @@ X-Mailer: git-send-email $gitversion
} }
if (!$smtp) { 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 ", "VALUES: server=$smtp_server ",
"encryption=$smtp_encryption ", "encryption=$smtp_encryption ",
defined $smtp_server_port ? "port=$smtp_server_port" : ""; defined $smtp_server_port ? "port=$smtp_server_port" : "";