undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'po/sendemail'

Browse Source 
* po/sendemail:
  New send-email option smtpserveroption.
  Remove @smtp_host_parts variable as not used.
  Minor indentation fix.
This commit is contained in:
Junio C Hamano 2010-10-26 21:37:54 -07:00
commit a7b60f0055
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/config.txt
View File

@ -1737,6 +1737,7 @@ sendemail.to::
sendemail.smtpdomain:: sendemail.smtpdomain::
sendemail.smtpserver:: sendemail.smtpserver::
sendemail.smtpserverport:: sendemail.smtpserverport::
sendemail.smtpserveroption::
sendemail.smtpuser:: sendemail.smtpuser::
sendemail.thread:: sendemail.thread::
sendemail.validate:: sendemail.validate::

9
Documentation/git-send-email.txt
View File

@ -165,6 +165,15 @@ user is prompted for a password while the input is masked for privacy.
are also accepted. The port can also be set with the are also accepted. The port can also be set with the
'sendemail.smtpserverport' configuration variable. 'sendemail.smtpserverport' configuration variable.
--smtp-server-option=<option>::
If set, specifies the outgoing SMTP server option to use.
Default value can be specified by the 'sendemail.smtpserveroption'
configuration option.
+
The --smtp-server-option option must be repeated for each option you want
to pass to the server. Likewise, different lines in the configuration files
must be used for each option.
--smtp-ssl:: --smtp-ssl::
Legacy alias for '--smtp-encryption ssl'. Legacy alias for '--smtp-encryption ssl'.

12
git-send-email.perl
View File

@ -61,6 +61,7 @@ git send-email [options] <file | directory | rev-list options >
--envelope-sender <str> * Email envelope sender. --envelope-sender <str> * Email envelope sender.
--smtp-server <str:int> * Outgoing SMTP server to use. The port --smtp-server <str:int> * Outgoing SMTP server to use. The port
is optional. Default 'localhost'. is optional. Default 'localhost'.
--smtp-server-option <str> * Outgoing SMTP server option to use.
--smtp-server-port <int> * Outgoing SMTP server port. --smtp-server-port <int> * Outgoing SMTP server port.
--smtp-user <str> * Username for SMTP-AUTH. --smtp-user <str> * Username for SMTP-AUTH.
--smtp-pass <str> * Password for SMTP-AUTH; not necessary. --smtp-pass <str> * Password for SMTP-AUTH; not necessary.
@ -191,8 +192,9 @@ sub do_edit {
# Variables with corresponding config settings # Variables with corresponding config settings
my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd); my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption); my ($smtp_server, $smtp_server_port, @smtp_server_options);
my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts, $smtp_domain); my ($smtp_authuser, $smtp_encryption);
my ($identity, $aliasfiletype, @alias_files, $smtp_domain);
my ($validate, $confirm); my ($validate, $confirm);
my (@suppress_cc); my (@suppress_cc);
my ($auto_8bit_encoding); my ($auto_8bit_encoding);
@ -213,9 +215,10 @@ my %config_bool_settings = (
my %config_settings = ( my %config_settings = (
"smtpserver" => \$smtp_server, "smtpserver" => \$smtp_server,
"smtpserverport" => \$smtp_server_port, "smtpserverport" => \$smtp_server_port,
"smtpserveroption" => \@smtp_server_options,
"smtpuser" => \$smtp_authuser, "smtpuser" => \$smtp_authuser,
"smtppass" => \$smtp_authpass, "smtppass" => \$smtp_authpass,
"smtpdomain" => \$smtp_domain, "smtpdomain" => \$smtp_domain,
"to" => \@to, "to" => \@to,
"cc" => \@initial_cc, "cc" => \@initial_cc,
"cccmd" => \$cc_cmd, "cccmd" => \$cc_cmd,
@ -282,6 +285,7 @@ my $rc = GetOptions("sender|from=s" => \$sender,
"no-bcc" => \$no_bcc, "no-bcc" => \$no_bcc,
"chain-reply-to!" => \$chain_reply_to, "chain-reply-to!" => \$chain_reply_to,
"smtp-server=s" => \$smtp_server, "smtp-server=s" => \$smtp_server,
"smtp-server-option=s" => \@smtp_server_options,
"smtp-server-port=s" => \$smtp_server_port, "smtp-server-port=s" => \$smtp_server_port,
"smtp-user=s" => \$smtp_authuser, "smtp-user=s" => \$smtp_authuser,
"smtp-pass:s" => \$smtp_authpass, "smtp-pass:s" => \$smtp_authpass,
@ -1029,6 +1033,8 @@ X-Mailer: git-send-email $gitversion
} }
} }
unshift (@sendmail_parameters, @smtp_server_options);
if ($dry_run) { if ($dry_run) {
# We don't want to send the email. # We don't want to send the email.
} elsif ($smtp_server =~ m#^/#) { } elsif ($smtp_server =~ m#^/#) {