From: Junio C Hamano <gitster@pobox.com>
To: "Bryan B. Lima" <bblima@usp.br>
Cc: git@vger.kernel.org, gustavoscorrea@usp.br,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH] submodule absorbgitdirs tests: use test_* helper functions
Date: Tue, 30 Jun 2026 11:00:28 -0700 [thread overview]
Message-ID: <xmqqmrwbsybn.fsf@gitster.g> (raw)
In-Reply-To: <20260630020220.1559190-1-bblima@usp.br> (Bryan B. Lima's message of "Mon, 29 Jun 2026 23:02:20 -0300")
"Bryan B. Lima" <bblima@usp.br> writes:
> Use modern helper functions from test-lib-functions.sh to provide nice error messages.
>
> Signed-off-by: Bryan B. Lima <bblima@usp.br>
> Co-authored-by: Gustavo S. Correa <gustavoscorrea@usp.br>
> Signed-off-by: Gustavo S. Correa <gustavoscorrea@usp.br>
> ---
> t/t7412-submodule-absorbgitdirs.sh | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
Welcome to the Git development community.
It is rare, but it happens from time to time, that we see a patch by
somebody we haven't seen on this list, and the patch looks perfect.
Very delighted.
Will queue. Thanks.
> diff --git a/t/t7412-submodule-absorbgitdirs.sh b/t/t7412-submodule-absorbgitdirs.sh
> index 0490499573..bd1c684480 100755
> --- a/t/t7412-submodule-absorbgitdirs.sh
> +++ b/t/t7412-submodule-absorbgitdirs.sh
> @@ -34,8 +34,8 @@ test_expect_success 'absorb the git dir' '
> git submodule absorbgitdirs 2>actual &&
> test_cmp expect actual &&
> git fsck &&
> - test -f sub1/.git &&
> - test -d .git/modules/sub1 &&
> + test_path_is_file sub1/.git &&
> + test_path_is_dir .git/modules/sub1 &&
> git status >actual.1 &&
> git -C sub1 rev-parse HEAD >actual.2 &&
> test_cmp expect.1 actual.1 &&
> @@ -47,9 +47,9 @@ test_expect_success 'absorbing does not fail for deinitialized submodules' '
> git submodule deinit --all &&
> git submodule absorbgitdirs 2>err &&
> test_must_be_empty err &&
> - test -d .git/modules/sub1 &&
> - test -d sub1 &&
> - ! test -e sub1/.git
> + test_path_is_dir .git/modules/sub1 &&
> + test_path_is_dir sub1 &&
> + test_path_is_missing sub1/.git
> '
>
> test_expect_success 'setup nested submodule' '
> @@ -72,8 +72,8 @@ test_expect_success 'absorb the git dir in a nested submodule' '
> EOF
> git submodule absorbgitdirs 2>actual &&
> test_cmp expect actual &&
> - test -f sub1/nested/.git &&
> - test -d .git/modules/sub1/modules/nested &&
> + test_path_is_file sub1/nested/.git &&
> + test_path_is_dir .git/modules/sub1/modules/nested &&
> git status >actual.1 &&
> git -C sub1/nested rev-parse HEAD >actual.2 &&
> test_cmp expect.1 actual.1 &&
> @@ -109,9 +109,9 @@ test_expect_success 'absorb the git dir in a nested submodule' '
> EOF
> git submodule absorbgitdirs 2>actual &&
> test_cmp expect actual &&
> - test -f sub1/.git &&
> - test -f sub1/nested/.git &&
> - test -d .git/modules/sub1/modules/nested &&
> + test_path_is_file sub1/.git &&
> + test_path_is_file sub1/nested/.git &&
> + test_path_is_dir .git/modules/sub1/modules/nested &&
> git status >actual.1 &&
> git -C sub1/nested rev-parse HEAD >actual.2 &&
> test_cmp expect.1 actual.1 &&
> @@ -155,7 +155,7 @@ test_expect_success 'absorbing the git dir fails for incomplete submodules' '
> test_must_fail git submodule absorbgitdirs 2>actual &&
> test_cmp expect actual &&
> git -C sub2 fsck &&
> - test -d sub2/.git &&
> + test_path_is_dir sub2/.git &&
> git status >actual &&
> git -C sub2 rev-parse HEAD >actual.2 &&
> test_cmp expect.1 actual.1 &&
>
> base-commit: e9019fcafe0040228b8631c30f97ae1adb61bcdc
next prev parent reply other threads:[~2026-06-30 18:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-30 2:02 [PATCH] submodule absorbgitdirs tests: use test_* helper functions Bryan B. Lima
2026-06-30 18:00 ` Junio C Hamano [this message]
2026-07-01 8:04 ` Patrick Steinhardt
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=xmqqmrwbsybn.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=bblima@usp.br \
--cc=git@vger.kernel.org \
--cc=gustavoscorrea@usp.br \
/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