git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/2] send-email: refactor sendemail.smtpencryption config parsing

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Apr 11, 2021, 14:43 UTC
Message-ID
<patch-2.2-2de5edcf8f4-20210411T144128Z-avarab@gmail.com>
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
Previous: Ævar Arnfjörð Bjarmason
Message 24 of 24 in “git-send-email: improve SSL configuration”
  1. 0/3 git-send-email: improve SSL configurationDrew DeVault, Apr 11, 2021
  2. 1/3 git-send-email(1): improve smtp-encryption docsDrew DeVault, Apr 11, 2021
  3. Ævar Arnfjörð BjarmasonApr 11, 2021
  4. 2/3 git-send-email: die on invalid smtp_encryptionDrew DeVault, Apr 11, 2021
  5. Ævar Arnfjörð BjarmasonApr 11, 2021
  6. Drew DeVaultApr 11, 2021
  7. Ævar Arnfjörð BjarmasonApr 11, 2021
  8. Ævar Arnfjörð BjarmasonApr 11, 2021
  9. Drew DeVaultApr 11, 2021
  10. Ævar Arnfjörð BjarmasonApr 11, 2021
  11. Drew DeVaultApr 12, 2021
  12. Ævar Arnfjörð BjarmasonApr 12, 2021
  13. Drew DeVaultApr 13, 2021
  14. Ævar Arnfjörð BjarmasonApr 13, 2021
  15. Junio C HamanoApr 13, 2021
  16. 3/3 git-send-email: rename 'tls' to 'starttls'Drew DeVault, Apr 11, 2021
  17. Ævar Arnfjörð BjarmasonApr 11, 2021
  18. Drew DeVaultApr 11, 2021
  19. 0/2 send-email: simplify smtp.{smtpssl,smtpencryption} parsingÆvar Arnfjörð Bjarmason, Apr 11, 2021
  20. 1/2 send-email: remove non-working support for "sendemail.smtpssl"Ævar Arnfjörð Bjarmason, Apr 11, 2021
  21. Junio C HamanoApr 11, 2021
  22. Ævar Arnfjörð BjarmasonApr 11, 2021
  23. Ævar Arnfjörð BjarmasonMay 1, 2021
  24. 2/2 send-email: refactor sendemail.smtpencryption config parsingÆvar Arnfjörð Bjarmason, Apr 11, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.