Re: [PATCH v2] t5510: replace 'origin' with URL more carefully (was Re: Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 21, 2022, 20:27 UTC
- Message-ID
- <xmqqy1xpg3th.fsf@gitster.g>
- In-Reply-To
- <xmqq1qviht4h.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
> Yup, a solution along that line was what I expected to see from > those who write Perl when I saw the discussion yesterday.
Here is what I queued tentatively. This is not exactly new; e1790f92 (fetch tests: fetch <url> <spec> as well as fetch [<remote>], 2018-02-09) first appeared in v2.17.0 and we can live with the same glitch for few more weeks ;-)
----- >8 --------- >8 --------- >8 --------- >8 --------- >8 ----- From: Derrick Stolee <derrickstolee@github.com> Date: Mon, 20 Jun 2022 15:52:09 -0400 Subject: [PATCH] t5510: replace 'origin' with URL more carefully
The many test_configured_prune tests in t5510-fetch.sh test many combinations of --prune, --prune-tags, and using 'origin' or an explicit URL. Some machinery was introduced in e1790f9245f (fetch tests: fetch <url> <spec> as well as fetch [<remote>], 2018-02-09) to replace 'origin' with this explicit URL. This URL is a "file:///" URL for the root of the $TRASH_DIRECTORY.
However, if the current build tree has an '@' symbol, the replacement using perl fails. It drops the '@' as well as anything else in that directory name. You can observe this locally by cloning git.git into a "victim@03" directory and running the test script.
As we are writing in Perl anyway, pass in the shell variables involved to the script as arguments and perform necessary string transformations inside it, instead of assuming that it is sufficient to enclose the $remote_url variable inside a pair of single quotes.
Reported-by: Randall Becker <rsbecker@nexbridge.com> Original-patch-by: Derrick Stolee <derrickstolee@github.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- t/t5510-fetch.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 4620f0ca7f..b45879a760 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -853,7 +853,11 @@ test_configured_prune_type () { then new_cmdline=$cmdline_setup else - new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g') + new_cmdline=$(perl -e ' + my ($cmdline, $url) = @ARGV; + $cmdline =~ s[origin(?!/)][quotemeta($url)]ge; + print $cmdline; + ' -- "$cmdline" "$remote_url") fi if test "$fetch_prune_tags" = 'true' ||
-- 2.37.0-rc1-99-g4626346e14