git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] submodule absorbgitdirs tests: use test_* helper functions

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 30, 2026, 18:00 UTC
Message-ID
<xmqqmrwbsybn.fsf@gitster.g>
In-Reply-To
<20260630020220.1559190-1-bblima@usp.br>
"Bryan B. Lima" <bblima@usp.br> writes:
Show 8 quoted lines
> 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.
Show 63 quoted lines
> 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
Previous: Bryan B. LimaNext: Patrick Steinhardt
Message 2 of 4 in “submodule absorbgitdirs tests: use test_* helper functions”
  1. submodule absorbgitdirs tests: use test_* helper functionsBryan B. Lima, Jun 30, 2026
  2. Junio C HamanoJun 30, 2026
  3. Patrick SteinhardtJul 1, 2026
  4. Junio C HamanoJul 27, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.