undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-tree + fetch tests: test failing "--super-prefix" interaction

Browse Source 
Ever since "git fetch --refetch" was introduced in 0f5e885173 (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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Glen Choo 2022-12-20 13:39:49 +01:00 committed by Junio C Hamano
parent 49eb1d388a
commit 0d1806e53d
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
t/t5616-partial-clone.sh
View File

@ -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 &&
test_when_finished "rm -rf src-sub" &&
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) &&
test_when_finished "rm -rf src-super" &&
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 client" &&
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