Re: git-send-email: smtpserver in $HOME

From

Jan “Khardix” Staněk <khardix@gmail.com>

Date

Feb 16, 2021, 12:49 UTC

Message-ID

<CAG+K25NbifB9k9ugU5ZjLAOKxLyfEZcphfZXNS9_Whi6gZcBLA@mail.gmail.com>

In-Reply-To

<xmqqo8gksqr4.fsf@gitster.c.googlers.com>

On 2021-02-15, Junio C Hamano wrote:

> I haven't given too much thought, but offhand do not think of a
> reason why a change like the attached would break things.

Seems reasonable, but I figured I rather ask beforehand.

>  git-send-email.perl | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git c/git-send-email.perl w/git-send-email.perl
> index 1f425c0809..ff58ac5046 100755
> --- c/git-send-email.perl
> +++ w/git-send-email.perl
> @@ -1006,6 +1006,8 @@ sub expand_one_alias {
>  		}
>  	}
>  	$smtp_server ||= 'localhost'; # could be 127.0.0.1, too... *shrug*
> +} elsif ($smtp_server =~ /^~/) {
> +	$smtp_server = glob($smtp_server);
>  }

diff --git a/git-send-email.perl b/git-send-email.perl
index 1f425c0809..84c07daf6d 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -268,7 +268,6 @@ sub do_edit {
 );

 my %config_settings = (
-    "smtpserver" => \$smtp_server,
     "smtpserverport" => \$smtp_server_port,
     "smtpserveroption" => \@smtp_server_options,
     "smtpuser" => \$smtp_authuser,
@@ -294,6 +293,7 @@ sub do_edit {

 my %config_path_settings = (
     "aliasesfile" => \@alias_files,
+    "smtpserver" => \$smtp_server,
     "smtpsslcertpath" => \$smtp_ssl_cert_path,
 );

This turns the smtpserver option into a "path setting",
which does the user expansion.
My concern was that if there is a SMTP server actually named
i.e. `~someone.example.org`, this change would break that.
Of course, the question is if something like that
is possible or supported…

I have not yet allocated enough time to figure out how to run
and/or modify the test suite, so I do not know if this would actually
break something. I will try to do that in the near future.
--
Jan Staněk – Khardix