From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"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>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 05/10] fetch tests: pass "mode" parameter first, pave way for "$@"
Date: Wed, 22 Jun 2022 00:34:17 +0200 [thread overview]
Message-ID: <patch-05.10-a3fb3174bde-20220621T222854Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-00.10-00000000000-20220621T222854Z-avarab@gmail.com>
Change the "$mode" parameter to be passed first, and setup a
command-line parser we'll be able to use for getting rid of many of
the boilerplate parameters.
This will allow us to unquote the command-line argument, and process
fetch arguments as a list of "$@". For now we need to do more work to
unpack these, but in a subsequent commit we'll be able to make the
shell quote handling here much simpler.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/t5510-fetch.sh | 43 +++++++++++++++++++++++++++++++++----------
1 file changed, 33 insertions(+), 10 deletions(-)
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 5d118a6a806..477b6dd4953 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -822,14 +822,29 @@ set_config_tristate () {
}
test_configured_prune_type () {
+ mode= &&
+ while test $# != 0
+ do
+ case "$1" in
+ --mode)
+ mode="$2" &&
+ shift
+ ;;
+ *)
+ break
+ ;;
+ esac &&
+ shift
+ done &&
+
local fetch_prune="$1" &&
local remote_origin_prune="$2" &&
local fetch_prune_tags="$3" &&
local remote_origin_prune_tags="$4" &&
local expected_branch="$5" &&
local expected_tag="$6" &&
- local cmdline="$7" &&
- local mode="$8" &&
+ shift 6 &&
+ local cmdline="$@" &&
if test -z "$cmdline_setup"
then
@@ -915,8 +930,8 @@ test_configured_prune_type () {
}
test_configured_prune () {
- test_configured_prune_type "$@" "name" &&
- test_configured_prune_type "$@" "link"
+ test_configured_prune_type --mode name "$@" &&
+ test_configured_prune_type --mode link "$@"
}
# $1 config: fetch.prune
@@ -1007,11 +1022,19 @@ test_configured_prune unset unset unset true pruned kept \
# +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
# command-line negates --prune-tags, the branches will not be pruned.
test_configured_prune_type_branch () {
- test_configured_prune_type "$1" "$2" "$3" "$4" pruned "$6" "$7" "name"
- test_configured_prune_type "$1" "$2" "$3" "$4" kept "$6" "$7" "link"
+ local cfg_fp="$1" &&
+ local cfg_rnp="$2" &&
+ local cfg_fpt="$3" &&
+ local cfg_rnpt="$4" &&
+ local arg_branch="$5" &&
+ local arg_tag="$6" &&
+ shift 6 &&
+
+ test_configured_prune_type --mode name "$cfg_fp" "$cfg_rnp" "$cfg_fpt" "$cfg_rnpt" pruned "$arg_tag" "$@"
+ test_configured_prune_type --mode link "$cfg_fp" "$cfg_rnp" "$cfg_fpt" "$cfg_rnpt" kept "$arg_tag" "$@"
}
-test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "name"
-test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "link"
+test_configured_prune_type --mode name unset unset unset unset kept kept "origin --prune-tags"
+test_configured_prune_type --mode link unset unset unset unset kept kept "origin --prune-tags"
test_configured_prune_type_branch unset unset unset unset - pruned "origin --prune --prune-tags"
test_configured_prune_type_branch unset unset unset unset - pruned "--prune --prune-tags origin"
test_configured_prune_type_branch unset unset true unset - pruned "--prune origin"
@@ -1029,8 +1052,8 @@ test_expect_success 'remove remote.origin.fetch "one"' '
git config --unset-all remote.origin.fetch
)
'
-test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
-test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
+test_configured_prune_type --mode name unset unset unset unset kept pruned "origin --prune --prune-tags"
+test_configured_prune_type --mode link unset unset unset unset kept pruned "origin --prune --prune-tags"
test_expect_success 'all boundary commits are excluded' '
test_commit base &&
--
2.36.1.1239.gfba91521d90
next prev parent reply other threads:[~2022-06-21 22:34 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 ` Ævar Arnfjörð Bjarmason [this message]
2022-06-22 6:01 ` [PATCH 05/10] fetch tests: pass "mode" parameter first, pave way for "$@" 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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-05.10-a3fb3174bde-20220621T222854Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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 NNTP newsgroup(s).