From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Drew DeVault" <sir@cmpwn.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 2/2] send-email: refactor sendemail.smtpencryption config parsing
Date: Sun, 11 Apr 2021 16:43:20 +0200 [thread overview]
Message-ID: <patch-2.2-2de5edcf8f4-20210411T144128Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.2-00000000000-20210411T144128Z-avarab@gmail.com>
With the removal of the support for sendemail.smtpssl in the preceding
commit the parsing of sendemail.smtpencryption is no longer special,
and can by moved to %config_settings.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
git-send-email.perl | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 877c7dd1a21..da28c6e8b4b 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -268,6 +268,7 @@ sub do_edit {
);
my %config_settings = (
+ "smtpencryption" => \$smtp_encryption,
"smtpserver" => \$smtp_server,
"smtpserverport" => \$smtp_server_port,
"smtpserveroption" => \@smtp_server_options,
@@ -368,14 +369,6 @@ sub read_config {
$$target = $v;
}
}
-
- if (!defined $smtp_encryption) {
- my $setting = "$prefix.smtpencryption";
- my $enc = Git::config(@repo, $setting);
- return unless defined $enc;
- return if $configured->{$setting}++;
- $smtp_encryption = $enc;
- }
}
# sendemail.identity yields to --identity. We must parse this
--
2.31.1.623.g88b15a793d
prev parent reply other threads:[~2021-04-11 14:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-11 12:54 [PATCH v2 0/3] git-send-email: improve SSL configuration Drew DeVault
2021-04-11 12:54 ` [PATCH v2 1/3] git-send-email(1): improve smtp-encryption docs Drew DeVault
2021-04-11 14:11 ` Ævar Arnfjörð Bjarmason
2021-04-11 12:54 ` [PATCH v2 2/3] git-send-email: die on invalid smtp_encryption Drew DeVault
2021-04-11 14:20 ` Ævar Arnfjörð Bjarmason
2021-04-11 14:21 ` Drew DeVault
2021-04-11 14:30 ` Ævar Arnfjörð Bjarmason
2021-04-11 15:06 ` Ævar Arnfjörð Bjarmason
2021-04-11 15:18 ` Drew DeVault
2021-04-11 19:56 ` Ævar Arnfjörð Bjarmason
2021-04-12 12:33 ` Drew DeVault
2021-04-12 13:16 ` Ævar Arnfjörð Bjarmason
2021-04-13 12:12 ` Drew DeVault
2021-04-13 14:22 ` Ævar Arnfjörð Bjarmason
2021-04-13 21:39 ` Junio C Hamano
2021-04-11 12:54 ` [PATCH v2 3/3] git-send-email: rename 'tls' to 'starttls' Drew DeVault
2021-04-11 14:17 ` Ævar Arnfjörð Bjarmason
2021-04-11 14:22 ` Drew DeVault
2021-04-11 14:43 ` [PATCH 0/2] send-email: simplify smtp.{smtpssl,smtpencryption} parsing Ævar Arnfjörð Bjarmason
2021-04-11 14:43 ` [PATCH 1/2] send-email: remove non-working support for "sendemail.smtpssl" Ævar Arnfjörð Bjarmason
2021-04-11 19:08 ` Junio C Hamano
2021-04-11 19:51 ` Ævar Arnfjörð Bjarmason
2021-05-01 9:15 ` Ævar Arnfjörð Bjarmason
2021-04-11 14:43 ` Ævar Arnfjörð Bjarmason [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-2.2-2de5edcf8f4-20210411T144128Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sir@cmpwn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).