From: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, chakrabortyabhradeep79@gmail.com,
Taylor Blau <me@ttaylorr.com>,
Derrick Stolee <derrickstolee@github.com>,
Derrick Stolee <derrickstolee@github.com>
Subject: [PATCH v2 2/2] test-lib-functions: fix test_subcommand_inexact
Date: Thu, 24 Mar 2022 18:34:57 +0000 [thread overview]
Message-ID: <ed67b7489719a01c88d7a6765e7499c1157da32e.1648146897.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1185.v2.git.1648146897.gitgitgadget@gmail.com>
From: Derrick Stolee <derrickstolee@github.com>
The implementation of test_subcommand_inexact() was originally
introduced in e4d0c11c0 (repack: respect kept objects with '--write-midx
-b', 2021-12-20) with the intention to allow finding a subcommand based
on an initial set of arguments. The inexactness was intended as a way to
allow flexible options beyond that initial set, as opposed to
test_subcommand() which requires that the full list of options is
provided in its entirety.
The implementation began by copying test_subcommand() and replaced the
repeated argument 'printf' statement to append ".*" instead of "," to
each argument. This has a few drawbacks:
1. Most importantly, this repeats the use of ".*" within 'expr', so the
inexact match is even more flexible than expected. It allows the list
of arguments to exist as a subsequence (with any other items included
between those arguments).
2. The line 'expr="$(expr%,}"' that previously removed a trailing comma
now no longer does anything, since the string ends with ".*".
Both of these issues are fixed by keeping the addition of the comma in
the printf statement, then adding ".*" after stripping out the trailing
comma.
All existing tests continue to pass with this change. There was one
instance from t7700-repack.sh that was taking advantage of this
flexibility, but it was removed in the previous change.
Helped-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
---
t/test-lib-functions.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 0f439c99d61..8f0e5da8727 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -1811,8 +1811,8 @@ test_subcommand_inexact () {
shift
fi
- local expr=$(printf '"%s".*' "$@")
- expr="${expr%,}"
+ local expr=$(printf '"%s",' "$@")
+ expr="${expr%,}.*"
if test -n "$negate"
then
--
gitgitgadget
next prev parent reply other threads:[~2022-03-24 18:35 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 20:34 [PATCH] test-lib-functions: fix test_subcommand_inexact Derrick Stolee via GitGitGadget
2022-03-22 15:17 ` Derrick Stolee
2022-03-23 14:53 ` Junio C Hamano
2022-03-23 14:55 ` Derrick Stolee
2022-03-23 21:45 ` Taylor Blau
2022-03-23 23:10 ` Junio C Hamano
2022-03-24 15:42 ` Derrick Stolee
2022-03-24 16:02 ` Taylor Blau
2022-03-24 16:39 ` Derrick Stolee
2022-03-24 16:38 ` Junio C Hamano
2022-03-24 18:10 ` Abhradeep Chakraborty
2022-03-25 0:33 ` Junio C Hamano
2022-03-25 8:13 ` Abhradeep Chakraborty
2022-03-24 18:34 ` [PATCH v2 0/2] " Derrick Stolee via GitGitGadget
2022-03-24 18:34 ` [PATCH v2 1/2] t7700: check post-condition in kept-pack test Derrick Stolee via GitGitGadget
2022-03-24 18:58 ` Taylor Blau
2022-03-25 13:55 ` Derrick Stolee
2022-03-25 17:07 ` Junio C Hamano
2022-03-25 17:23 ` Derrick Stolee
2022-03-25 17:36 ` Taylor Blau
2022-03-25 18:22 ` Junio C Hamano
2022-03-24 18:34 ` Derrick Stolee via GitGitGadget [this message]
2022-03-24 18:49 ` [PATCH v2 2/2] test-lib-functions: fix test_subcommand_inexact Taylor Blau
2022-03-24 20:48 ` Junio C Hamano
2022-03-25 14:03 ` Derrick Stolee
2022-03-25 17:25 ` Junio C Hamano
2022-03-25 19:02 ` [PATCH v3 0/2] " Derrick Stolee via GitGitGadget
2022-03-25 19:02 ` [PATCH v3 1/2] t7700: check post-condition in kept-pack test Derrick Stolee via GitGitGadget
2022-03-25 19:02 ` [PATCH v3 2/2] test-lib-functions: remove test_subcommand_inexact Derrick Stolee via GitGitGadget
2022-03-30 2:44 ` [PATCH v3 0/2] test-lib-functions: fix test_subcommand_inexact Taylor Blau
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=ed67b7489719a01c88d7a6765e7499c1157da32e.1648146897.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=chakrabortyabhradeep79@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.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).