From: Junio C Hamano <gitster@pobox.com>
To: Drew DeVault <sir@cmpwn.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] git-send-email: die if sendmail.* config is set
Date: Sat, 18 Jul 2020 13:38:25 -0700 [thread overview]
Message-ID: <xmqq8sfgbltq.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200718202142.111015-1-sir@cmpwn.com> (Drew DeVault's message of "Sat, 18 Jul 2020 16:21:42 -0400")
Drew DeVault <sir@cmpwn.com> writes:
> I've seen several people mis-configure git send-email on their first
> attempt because they set the sendmail.* config options - not
> sendemail.*. This patch detects this mistake and bails out with a
> friendly warning.
>
> Signed-off-by: Drew DeVault <sir@cmpwn.com>
> ---
> Documentation/config/sendemail.txt | 5 +++++
> git-send-email.perl | 8 ++++++++
> perl/Git.pm | 26 ++++++++++++++++++++++++++
> 3 files changed, 39 insertions(+)
>
> diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt
> index 0006faf800..1726d5f85e 100644
> --- a/Documentation/config/sendemail.txt
> +++ b/Documentation/config/sendemail.txt
> @@ -61,3 +61,8 @@ sendemail.smtpBatchSize::
> sendemail.smtpReloginDelay::
> Seconds wait before reconnecting to smtp server.
> See also the `--relogin-delay` option of linkgit:git-send-email[1].
> +
> +sendemail.forceSendmailVariables::
> + To avoid common misconfiguration mistakes, linkgit:git-send-email[1]
> + will abort with a warning if any configuration options for "sendmail"
> + exist. Set this variable to bypass the check.
I am not sure if it is clear to readers what kind of forcing this
refers to. At least it is not clear to me.
> diff --git a/git-send-email.perl b/git-send-email.perl
> index 36c47bae1d..1b186bc058 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -250,6 +250,7 @@ sub do_edit {
> my $use_xmailer = 1;
> my $validate = 1;
> my $target_xfer_encoding = 'auto';
> +my $forbid_sendmail_variables = 1;
Ah, probably s/force/forbid/ in the documentation above? OK, then
it makes sense.
>
> my %config_bool_settings = (
> "thread" => \$thread,
> @@ -263,6 +264,7 @@ sub do_edit {
> "multiedit" => \$multiedit,
> "annotate" => \$annotate,
> "xmailer" => \$use_xmailer,
> + "forbidsendmailvariables" => \$forbid_sendmail_variables,
> );
>
> my %config_settings = (
> @@ -478,6 +480,12 @@ sub read_config {
> usage();
> }
>
> +if ($forbid_sendmail_variables && (scalar Git::config_regexp("sendmail.*")) != 0) {
Judging from the way you wrote the "config_regexp" helper function,
the above regexp matches "sendmailer.foo", "sendmailed.bar", etc., I
would think, which probably is not what you intended.
I guess we can write "sendmail[.].*" or "sendmail\\..*" to ensure
that we are talking about (literally) "sendmail." followed by
anything?
> + die __("fatal: found configuration options for 'sendmail'\n" .
> + "git-send-email is configured with the sendemail.* options - note the 'e'.\n" .
> + "Set sendemail.forbidSendmailVariables to false to disable this check.\n");
> +}
OK.
Other than the two minor nits, looking quite good.
Thanks.
> die __("Cannot run git format-patch from outside a repository\n")
> if $format_patch and not $repo;
>
> diff --git a/perl/Git.pm b/perl/Git.pm
> index 54c9ed0dde..10df990959 100644
> --- a/perl/Git.pm
> +++ b/perl/Git.pm
> @@ -723,6 +723,32 @@ sub config_int {
> return scalar _config_common({'kind' => '--int'}, @_);
> }
>
> +=item config_regexp ( RE )
> +
> +Retrieve the list of configuration key names matching the regular
> +expression C<RE>. The return value is a list of strings matching
> +this regex.
> +
> +=cut
> +
> +sub config_regexp {
> + my ($self, $regex) = _maybe_self(@_);
> + try {
> + my @cmd = ('config', '--name-only', '--get-regexp', $regex);
> + unshift @cmd, $self if $self;
> + my @matches = command(@cmd);
> + return @matches;
> + } catch Git::Error::Command with {
> + my $E = shift;
> + if ($E->value() == 1) {
> + my @matches = ();
> + return @matches;
> + } else {
> + throw $E;
> + }
> + };
> +}
> +
> # Common subroutine to implement bulk of what the config* family of methods
> # do. This currently wraps command('config') so it is not so fast.
> sub _config_common {
next prev parent reply other threads:[~2020-07-18 20:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 20:21 [PATCH v2] git-send-email: die if sendmail.* config is set Drew DeVault
2020-07-18 20:38 ` Junio C Hamano [this message]
2020-07-19 6:07 ` Junio C Hamano
2020-07-20 17:33 ` Jeff King
2020-07-20 17:40 ` Drew DeVault
2020-07-24 0:42 ` Junio C Hamano
2020-07-24 0:43 ` Drew DeVault
2020-07-24 0:59 ` Junio C Hamano
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=xmqq8sfgbltq.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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).