From: Junio C Hamano <gitster@pobox.com>
To: Gregory Anders <greg@gpanders.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3] git-send-email: add option to specify sendmail command
Date: Fri, 14 May 2021 13:25:09 +0900 [thread overview]
Message-ID: <xmqq7dk27xi2.fsf@gitster.g> (raw)
In-Reply-To: <20210513152329.22578-1-greg@gpanders.com> (Gregory Anders's message of "Thu, 13 May 2021 09:23:29 -0600")
Gregory Anders <greg@gpanders.com> writes:
> Use a block scoped variable to print the sendmail invocation at the end
> of the 'send_message' subroutine. Assigning directly to $sendmail_cmd
> (as in the v2 patch) causes some bizarre problems; namely, it seems to
> affect the value of $sendmail_cmd that is read at earlier points in the
> same subroutine, which causes test invocations of the form
>
> git send-email --smtp-server="$(pwd)/fake.sendmail"
>
> to fail. The value passed to --smtp-server was assigned to $sendmail_cmd
> at the end of the 'send_message' subprocedure, but somehow this caused
> the 'if (defined $sendmail_cmd)' condition earlier in the subproc to
> evaluate to true.
Are you talking about the use of $sm that is local to the debug
output? I think leaving $sendmail_cmd intact by using a separate
variable is the right choice. Isn't the problem you observed a
consequence of send_message() getting called once for each message,
so assigning to $sendmail_cmd in the function for the first
invocation of the function would change its value for the second
invocation?
Also, if we have been using
--smtp-server=$(pwd)/fake.sendmail
we cannot expect to use the same value like this:
--sendmail-cmd=$(pwd)/fake.sendmail
because we deliberately add a space in the $(pwd) by choosing the
name of the test directory to be "trash directory.something". We'd
need to do something like
--sendmail-cmd='$(pwd)/fake.sendmail'
so that the shell sees '$(pwd)/fake.sendmail' literally and runs pwd
to find out what the path to the program is, I would think.
> diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
> index 65b3035371..583fbba410 100755
> --- a/t/t9001-send-email.sh
> +++ b/t/t9001-send-email.sh
> @@ -2148,6 +2148,37 @@ test_expect_success $PREREQ 'leading and trailing whitespaces are removed' '
> test_cmp expected-list actual-list
> '
>
> +test_expect_success $PREREQ 'test using command name with --sendmail-cmd' '
> + clean_fake_sendmail &&
> + PATH="$(pwd):$PATH" \
> + git send-email \
> + --from="Example <nobody@example.com>" \
> + --to=nobody@example.com \
> + --sendmail-cmd="fake.sendmail" \
> + HEAD^ &&
> + test_path_is_file commandline1
> +'
Nice demonstration of the "we no longer need an absolute pathname"
feature.
> +test_expect_success $PREREQ 'test using arguments with --sendmail-cmd' '
> + clean_fake_sendmail &&
> + git send-email \
> + --from="Example <nobody@example.com>" \
> + --to=nobody@example.com \
> + --sendmail-cmd="\"$(pwd)/fake.sendmail\" -f nobody@example.com" \
> + HEAD^ &&
> + test_path_is_file commandline1
> +'
Hmph, if $(pwd) has a double quote character in it, this may not
work as expected, as the shell that is expanding the command line
arguments for "git send-email" would see $(pwd), expand it and our
program will see
"/path/with/d"quote/git/t/trash directory.9001/fake.sendmail" -f nobody@e.c
as the value of --sendmail-cmd, which would not interpolate well,
no?
We want the shell that eats the command line of 'git send-email' to see
--sendmail-cmd='$(pwd)/fake.sendmail'\" -f nobody@example.com"
and because this is inside a sq pair, it would become
--sendmail-cmd='\''$(pwd)/fake.sendmail'\''\" -f nobody@example.com"
after we replace each sq with '\'', or something like that, perhaps?
> +test_expect_success $PREREQ 'test shell expression with --sendmail-cmd' '
> + clean_fake_sendmail &&
> + git send-email \
> + --from="Example <nobody@example.com>" \
> + --to=nobody@example.com \
> + --sendmail-cmd="f() { \"$(pwd)/fake.sendmail\" \"\$@\"; };f" \
> + HEAD^ &&
> + test_path_is_file commandline1
> +'
Nice demonstration of how a bit of scripting can be used.
> test_expect_success $PREREQ 'invoke hook' '
> mkdir -p .git/hooks &&
Thanks.
next prev parent reply other threads:[~2021-05-14 4:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 3:30 [PATCH] git-send-email: add sendmailCommand option Gregory Anders
2021-05-12 4:19 ` Junio C Hamano
2021-05-12 13:03 ` Gregory Anders
2021-05-12 7:57 ` Felipe Contreras
2021-05-12 13:12 ` Gregory Anders
2021-05-12 17:21 ` Felipe Contreras
2021-05-12 18:06 ` Gregory Anders
2021-05-12 19:32 ` Felipe Contreras
2021-05-12 9:04 ` Ævar Arnfjörð Bjarmason
2021-05-12 13:18 ` Gregory Anders
2021-05-13 2:32 ` [PATCH v2] git-send-email: add option to specify sendmail command Gregory Anders
2021-05-13 3:58 ` Junio C Hamano
2021-05-13 13:31 ` Gregory Anders
2021-05-13 21:21 ` Junio C Hamano
2021-05-13 15:23 ` [PATCH v3] " Gregory Anders
2021-05-14 4:25 ` Junio C Hamano [this message]
2021-05-14 5:16 ` Junio C Hamano
2021-05-14 14:12 ` Gregory Anders
2021-05-14 15:15 ` [PATCH v4] " Gregory Anders
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=xmqq7dk27xi2.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=greg@gpanders.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).