Re: [PATCH v2 01/10] read-tree + fetch tests: test failing "--super-prefix" interaction

From: Glen Choo <chooglen@google.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Cc: "Taylor Blau" <me@ttaylorr.com>,
	"Robert Coup" <robert@coup.net.nz>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v2 01/10] read-tree + fetch tests: test failing "--super-prefix" interaction
Date: Mon, 14 Nov 2022 11:00:22 -0800	[thread overview]
Message-ID: <kl6lo7t91hvd.fsf@chooglen-macbookpro.roam.corp.google.com> (raw)
In-Reply-To: <patch-v2-01.10-1114a4ff666-20221114T100803Z-avarab@gmail.com>

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> From: Glen Choo <chooglen@google.com>
>
> Ever since "git fetch --refetch" was introduced in 0f5e8851737 (Merge
> branch 'rc/fetch-refetch', 2022-04-04) the test being added here would
> fail. This is because "restore" will "read-tree .. --reset <hash>",
> which will in turn invoke "fetch". The "fetch" will then die with:
>
> 	fatal: fetch doesn't support --super-prefix
>
> This edge case and other "--super-prefix" bugs will be fixed in
> subsequent commits, but let's first add a "test_expect_failure" test
> for it. It passes until the very last command in the test.
>
> Signed-off-by: Glen Choo <chooglen@google.com>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  t/t5616-partial-clone.sh | 43 ++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
>
> diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
> index 037941b95d2..e56466580cf 100755
> --- a/t/t5616-partial-clone.sh
> +++ b/t/t5616-partial-clone.sh
> @@ -644,6 +644,49 @@ test_expect_success 'repack does not loosen promisor objects' '
>  	grep "loosen_unused_packed_objects/loosened:0" trace
>  '
>  
> +test_expect_failure 'lazy-fetch in submodule succeeds' '
> +	# setup
> +	test_config_global protocol.file.allow always &&
> +
> +	git init src-sub &&
> +	git -C src-sub config uploadpack.allowfilter 1 &&
> +	git -C src-sub config uploadpack.allowanysha1inwant 1 &&
> +
> +	# This blob must be missing in the subsequent commit.
> +	echo foo >src-sub/file &&
> +	git -C src-sub add file &&
> +	git -C src-sub commit -m "submodule one" &&
> +	SUB_ONE=$(git -C src-sub rev-parse HEAD) &&
> +
> +	echo bar >src-sub/file &&
> +	git -C src-sub add file &&
> +	git -C src-sub commit -m "submodule two" &&
> +	SUB_TWO=$(git -C src-sub rev-parse HEAD) &&
> +
> +	git init src-super &&
> +	git -C src-super config uploadpack.allowfilter 1 &&
> +	git -C src-super config uploadpack.allowanysha1inwant 1 &&
> +	git -C src-super submodule add ../src-sub src-sub &&
> +
> +	git -C src-super/src-sub checkout $SUB_ONE &&
> +	git -C src-super add src-sub &&
> +	git -C src-super commit -m "superproject one" &&
> +
> +	git -C src-super/src-sub checkout $SUB_TWO &&
> +	git -C src-super add src-sub &&
> +	git -C src-super commit -m "superproject two" &&
> +
> +	# the fetch
> +	test_when_finished "rm -rf src-super src-sub client" &&

(Genuinely curious) are we okay with test_when_finished in the middle of
the test body instead of at the top?

> +
> +	test_config_global protocol.file.allow always &&

We have this exact same test_config_global line at the top of this test,
so we can drop this one.

> +	git clone --filter=blob:none --also-filter-submodules \
> +		--recurse-submodules "file://$(pwd)/src-super" client &&
> +
> +	# Trigger lazy-fetch from the superproject
> +	git -C client restore --recurse-submodules --source=HEAD^ :/
> +'
> +
>  . "$TEST_DIRECTORY"/lib-httpd.sh
>  start_httpd
>  
> -- 
> 2.38.0.1471.ge4d8947e7aa