From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, "Derrick Stolee" <derrickstolee@github.com>,
rsbecker@nexbridge.com, "SZEDER Gábor" <szeder.dev@gmail.com>,
"Johannes Sixt" <j6t@kdbg.org>, "Jeff King" <peff@peff.net>
Subject: Re: [PATCH 10/10] fetch tests: fix needless and buggy re-quoting
Date: Tue, 21 Jun 2022 23:12:34 -0700 [thread overview]
Message-ID: <xmqqsfnx6xbh.fsf@gitster.g> (raw)
In-Reply-To: <patch-10.10-54129b94a77-20220621T222854Z-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Wed, 22 Jun 2022 00:34:22 +0200")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> - remote_url="file://$TRASH_DIRECTORY/." && # NOT local yet!
> - local cmdline_setup="\"$remote_url\" \"$refspec_heads\""
Good riddance ;-)
> + local remote_url="file://$TRASH_DIRECTORY/." &&
>
> ...
> - git fetch '"$cmdline_setup"' &&
> + git fetch "$remote_url" "$refspec_heads" &&
> ...
> + git$git_fetch_c fetch \
> + ${arg_fetch_prune:+--prune} \
> + ${arg_fetch_no_prune:+--no-prune} \
> + ${arg_fetch_prune_tags:+--prune-tags} \
> + ${arg_fetch_origin:+origin} \
> + ${arg_fetch_url:+"$remote_url"} \
> + ${arg_fetch_refspec_tags:+"refs/tags/*:refs/tags/*"} \
> + ${arg_fetch_refspec_heads:+"+refs/heads/*:refs/remotes/origin/*"} &&
> +
This makes it a lot clearer, with no perl, no sed, no eval. It does
become louder, but should be easier to follow in general ...
> test_configured_prune_type --mode link true unset true unset pruned pruned \
> - "\"$remote_url\"" \
> + REMOTE_URL \
> "refs/tags/*:refs/tags/*" "+refs/heads/*:refs/remotes/origin/*"
... except for a magic like this one.
We may remember the REMOTE_URL -> $remote_url trick used here this
week, but I am not sure if we find it sensible in 3 months.
But overall I think this makes it simpler. I am not 100% sold on
the necessity of lengthy earlier steps, though.
Thanks.
next prev parent reply other threads:[~2022-06-22 6:13 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 18:04 Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1 rsbecker
2022-06-20 18:46 ` Derrick Stolee
2022-06-20 18:59 ` rsbecker
2022-06-20 20:00 ` Derrick Stolee
2022-06-20 20:30 ` Ævar Arnfjörð Bjarmason
2022-06-20 20:43 ` Junio C Hamano
2022-06-20 21:24 ` rsbecker
2022-06-20 21:33 ` Ævar Arnfjörð Bjarmason
2022-06-20 20:34 ` SZEDER Gábor
2022-06-20 22:17 ` rsbecker
2022-06-20 22:20 ` [PATCH v2] t5510: replace 'origin' with URL more carefully (was Re: Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1) Derrick Stolee
2022-06-21 5:28 ` Johannes Sixt
2022-06-21 7:17 ` Jeff King
2022-06-21 9:29 ` SZEDER Gábor
2022-06-21 10:07 ` Jeff King
2022-06-21 16:35 ` Junio C Hamano
2022-06-21 20:27 ` Junio C Hamano
2022-06-21 21:13 ` Derrick Stolee
2022-06-21 21:36 ` Junio C Hamano
2022-06-21 22:34 ` [PATCH 00/10] t5510: fix the quoting mess Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 01/10] fetch tests: remove redundant test_unconfig() Ævar Arnfjörð Bjarmason
2022-06-22 5:52 ` Junio C Hamano
2022-06-21 22:34 ` [PATCH 02/10] fetch tests: use named, not positional parameters Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 03/10] fetch tests: use "local", &&-chaining, style etc Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 04/10] fetch tests: add a helper to avoid boilerplate Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 05/10] fetch tests: pass "mode" parameter first, pave way for "$@" Ævar Arnfjörð Bjarmason
2022-06-22 6:01 ` Junio C Hamano
2022-06-21 22:34 ` [PATCH 06/10] fetch tests: pass a list, not a string of arguments Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 07/10] fetch tests: remove lazy variable setup Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 08/10] fetch tests: remove shelling out for previously "lazy" variables Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 09/10] fetch tests: stop implicitly adding refspecs Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 10/10] fetch tests: fix needless and buggy re-quoting Ævar Arnfjörð Bjarmason
2022-06-22 6:12 ` Junio C Hamano [this message]
2022-06-22 11:25 ` Derrick Stolee
2022-06-22 15:21 ` Ævar Arnfjörð Bjarmason
2022-06-22 15:44 ` Junio C Hamano
2022-06-21 13:51 ` Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1 rsbecker
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=xmqqsfnx6xbh.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=peff@peff.net \
--cc=rsbecker@nexbridge.com \
--cc=szeder.dev@gmail.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).