In the previous commit, we changed how partial repo is cloned.
Adapt tests to these changes. Also check gc does not delete normal
objects too.
Signed-off-by: Han Young <hanyang.tony@xxxxxxxxxxxxx>
---
t/t0410-partial-clone.sh | 68 +--------------------------
t/t5616-partial-clone.sh | 9 +---
t/t5710-promisor-remote-capability.sh | 15 ++++--
3 files changed, 14 insertions(+), 78 deletions(-)
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index 818700fbec..c87102fcb7 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -500,46 +500,6 @@ test_expect_success 'single promisor remote can be re-initialized gracefully' '
git -C repo fetch --filter=blob:none foo
'
-test_expect_success 'gc repacks promisor objects separately from non-promisor objects' '
- rm -rf repo &&
- test_create_repo repo &&
- test_commit -C repo one &&
- test_commit -C repo two &&
-
- TREE_ONE=$(git -C repo rev-parse one^{tree}) &&
- printf "$TREE_ONE\n" | pack_as_from_promisor &&
- TREE_TWO=$(git -C repo rev-parse two^{tree}) &&
- printf "$TREE_TWO\n" | pack_as_from_promisor &&
-
- git -C repo config core.repositoryformatversion 1 &&
- git -C repo config extensions.partialclone "arbitrary string" &&
- git -C repo gc &&
-
- # Ensure that exactly one promisor packfile exists, and that it
- # contains the trees but not the commits
- ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
- test_line_count = 1 promisorlist &&
- PROMISOR_PACKFILE=$(sed "s/.promisor/.pack/" <promisorlist) &&
- git verify-pack $PROMISOR_PACKFILE -v >out &&
- grep "$TREE_ONE" out &&
- grep "$TREE_TWO" out &&
- ! grep "$(git -C repo rev-parse one)" out &&
- ! grep "$(git -C repo rev-parse two)" out &&
-
- # Remove the promisor packfile and associated files
- rm $(sed "s/.promisor//" <promisorlist).* &&
-
- # Ensure that the single other pack contains the commits, but not the
- # trees
- ls repo/.git/objects/pack/pack-*.pack >packlist &&
- test_line_count = 1 packlist &&
- git verify-pack repo/.git/objects/pack/pack-*.pack -v >out &&
- grep "$(git -C repo rev-parse one)" out &&
- grep "$(git -C repo rev-parse two)" out &&
- ! grep "$TREE_ONE" out &&
- ! grep "$TREE_TWO" out
-'
-
test_expect_success 'gc does not repack promisor objects if there are none' '
rm -rf repo &&
test_create_repo repo &&
@@ -570,7 +530,7 @@ repack_and_check () {
git -C repo2 cat-file -e $3
}
-test_expect_success 'repack -d does not irreversibly delete promisor objects' '
+test_expect_success 'repack -d does not irreversibly delete objects' '
rm -rf repo &&
test_create_repo repo &&
git -C repo config core.repositoryformatversion 1 &&
@@ -584,40 +544,14 @@ test_expect_success 'repack -d does not irreversibly delete promisor objects' '
TWO=$(git -C repo rev-parse HEAD^^) &&
THREE=$(git -C repo rev-parse HEAD^) &&
- printf "$TWO\n" | pack_as_from_promisor &&
printf "$THREE\n" | pack_as_from_promisor &&
delete_object repo "$ONE" &&
- repack_and_check --must-fail -ab "$TWO" "$THREE" &&
repack_and_check -a "$TWO" "$THREE" &&
repack_and_check -A "$TWO" "$THREE" &&
repack_and_check -l "$TWO" "$THREE"
'
-test_expect_success 'gc stops traversal when a missing but promised object is reached' '
- rm -rf repo &&
- test_create_repo repo &&
- test_commit -C repo my_commit &&
-
- TREE_HASH=$(git -C repo rev-parse HEAD^{tree}) &&
- HASH=$(promise_and_delete $TREE_HASH) &&
-
- git -C repo config core.repositoryformatversion 1 &&
- git -C repo config extensions.partialclone "arbitrary string" &&
- git -C repo gc &&
-
- # Ensure that the promisor packfile still exists, and remove it
- test -e repo/.git/objects/pack/pack-$HASH.pack &&
- rm repo/.git/objects/pack/pack-$HASH.* &&
-
- # Ensure that the single other pack contains the commit, but not the tree
- ls repo/.git/objects/pack/pack-*.pack >packlist &&
- test_line_count = 1 packlist &&
- git verify-pack repo/.git/objects/pack/pack-*.pack -v >out &&
- grep "$(git -C repo rev-parse HEAD)" out &&
- ! grep "$TREE_HASH" out
-'
-
test_expect_success 'do not fetch when checking existence of tree we construct ourselves' '
rm -rf repo &&
test_create_repo repo &&
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 2c2c50e3ff..19166cd4ce 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -643,16 +643,9 @@ test_expect_success 'fetch from a partial clone, protocol v2' '
grep "version 2" trace
'
-test_expect_success 'repack does not loosen promisor objects' '
- rm -rf client trace &&
- git clone --bare --filter=blob:none "file://$(pwd)/srv.bare" client &&
- test_when_finished "rm -rf client trace" &&
- GIT_TRACE2_PERF="$(pwd)/trace" git -C client repack -A -d &&
- grep "loosen_unused_packed_objects/loosened:0" trace
-'
-
test_expect_success 'lazy-fetch in submodule succeeds' '
# setup
+ rm -rf client &&
test_config_global protocol.file.allow always &&
test_when_finished "rm -rf src-sub" &&
diff --git a/t/t5710-promisor-remote-capability.sh b/t/t5710-promisor-remote-capability.sh
index c2c83a5914..0912acae44 100755
--- a/t/t5710-promisor-remote-capability.sh
+++ b/t/t5710-promisor-remote-capability.sh
@@ -32,17 +32,26 @@ check_missing_objects () {
}
initialize_server () {
- # Repack everything first
- git -C server -c repack.writebitmaps=false repack -a -d &&
+ git -C server remote remove server2
+ has_promisor_remote=$?
# Remove promisor file in case they exist, useful when reinitializing
rm -rf server/objects/pack/*.promisor &&
+ # Repack everything first
+ git -C server -c repack.writebitmaps=false repack -a -d &&
+
# Repack without the largest object and create a promisor pack on server
git -C server -c repack.writebitmaps=false repack -a -d \
--filter=blob:limit=5k --filter-to="$(pwd)" &&
promisor_file=$(ls server/objects/pack/*.pack | sed "s/\.pack/.promisor/") &&
- touch "$promisor_file" &&
+ touch "$promisor_file"
+
+ # Configure server2 as promisor remote for server
+ if [[ $has_promisor_remote -eq 0 ]]; then
+ git -C server remote add server2 "file://$(pwd)/server2" &&
+ git -C server config remote.server2.promisor true
+ fi
# Check that only one object is missing on the server
check_missing_objects server 1 "$oid"
--
2.47.0.266.g0b04b6b485.dirty
