summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-27 04:37:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-27 04:37:54 (GMT)
commita7b60f00557002a37b1ea2e1922ac6ffbfc61fef (patch)
treeb7438e5a17e1ba900cd1d9d5d1f0ff7e82d00444 /git-send-email.perl
parentacbaf54f3030854b54f8391f7d1ca11935a75518 (diff)
parent052fbea26e51121d155ccaa3b0ae6ac892cc41ea (diff)
downloadgit-a7b60f00557002a37b1ea2e1922ac6ffbfc61fef.zip
git-a7b60f00557002a37b1ea2e1922ac6ffbfc61fef.tar.gz
git-a7b60f00557002a37b1ea2e1922ac6ffbfc61fef.tar.bz2
Merge branch 'po/sendemail'
* po/sendemail: New send-email option smtpserveroption. Remove @smtp_host_parts variable as not used. Minor indentation fix.
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl12
1 files changed, 9 insertions, 3 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 8cc4161..458e86a 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -61,6 +61,7 @@ git send-email [options] <file | directory | rev-list options >
--envelope-sender <str> * Email envelope sender.
--smtp-server <str:int> * Outgoing SMTP server to use. The port
is optional. Default 'localhost'.
+ --smtp-server-option <str> * Outgoing SMTP server option to use.
--smtp-server-port <int> * Outgoing SMTP server port.
--smtp-user <str> * Username for SMTP-AUTH.
--smtp-pass <str> * Password for SMTP-AUTH; not necessary.
@@ -191,8 +192,9 @@ sub do_edit {
# Variables with corresponding config settings
my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
-my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption);
-my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts, $smtp_domain);
+my ($smtp_server, $smtp_server_port, @smtp_server_options);
+my ($smtp_authuser, $smtp_encryption);
+my ($identity, $aliasfiletype, @alias_files, $smtp_domain);
my ($validate, $confirm);
my (@suppress_cc);
my ($auto_8bit_encoding);
@@ -213,9 +215,10 @@ my %config_bool_settings = (
my %config_settings = (
"smtpserver" => \$smtp_server,
"smtpserverport" => \$smtp_server_port,
+ "smtpserveroption" => \@smtp_server_options,
"smtpuser" => \$smtp_authuser,
"smtppass" => \$smtp_authpass,
- "smtpdomain" => \$smtp_domain,
+ "smtpdomain" => \$smtp_domain,
"to" => \@to,
"cc" => \@initial_cc,
"cccmd" => \$cc_cmd,
@@ -282,6 +285,7 @@ my $rc = GetOptions("sender|from=s" => \$sender,
"no-bcc" => \$no_bcc,
"chain-reply-to!" => \$chain_reply_to,
"smtp-server=s" => \$smtp_server,
+ "smtp-server-option=s" => \@smtp_server_options,
"smtp-server-port=s" => \$smtp_server_port,
"smtp-user=s" => \$smtp_authuser,
"smtp-pass:s" => \$smtp_authpass,
@@ -1029,6 +1033,8 @@ X-Mailer: git-send-email $gitversion
}
}
+ unshift (@sendmail_parameters, @smtp_server_options);
+
if ($dry_run) {
# We don't want to send the email.
} elsif ($smtp_server =~ m#^/#) {