summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2015-12-01 18:54:34 -0500
committerLibravatar Jeff King <peff@peff.net>2015-12-01 18:54:34 -0500
commitd0e8377b90697cce0d9dfb53dcf5d04018ba9259 (patch)
tree5714d5bde44aa3c70c968a84c56667b50c5b5c4d
parentMerge branch 'dg/subtree-test-cleanup' (diff)
parentsend-email: expand path in sendemail.smtpsslcertpath config (diff)
downloadtgif-d0e8377b90697cce0d9dfb53dcf5d04018ba9259.tar.xz
Merge branch 'jk/send-email-expand-paths'
Expand paths in some send-email config variables. * jk/send-email-expand-paths: send-email: expand path in sendemail.smtpsslcertpath config
-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 e907e0eacf..719c715360 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -239,7 +239,6 @@ my %config_settings = (
"smtpserveroption" => \@smtp_server_options,
"smtpuser" => \$smtp_authuser,
"smtppass" => \$smtp_authpass,
- "smtpsslcertpath" => \$smtp_ssl_cert_path,
"smtpdomain" => \$smtp_domain,
"smtpauth" => \$smtp_auth,
"to" => \@initial_to,
@@ -259,6 +258,7 @@ my %config_settings = (
my %config_path_settings = (
"aliasesfile" => \@alias_files,
+ "smtpsslcertpath" => \$smtp_ssl_cert_path,
);
# Handle Uncouth Termination