mirror of
https://github.com/git/git.git
synced 2024-11-28 04:23:30 +08:00
e75d2f7f73
Extend the the release_revisions() function so that it frees the "filter" in the "struct rev_info". This in combination with a preceding change to free "cmdline" means that we can mark another set of tests as passing under "TEST_PASSES_SANITIZE_LEAK=true". The "filter" member was added recently inffaa137f64(revision: put object filter into struct rev_info, 2022-03-09), and this fixes leaks intruded in the subsequent leak7940941de1(pack-objects: use rev.filter when possible, 2022-03-09) and105c6f14ad(bundle: parse filter capability, 2022-03-09). The "builtin/pack-objects.c" leak in7940941de1was effectively with us already, but the variable was referred to by a "static" file-scoped variable. The "bundle.c " leak in105c6f14adwas newly introduced with the new "filter" feature for bundles. The "t5600-clone-fail-cleanup.sh" change here to add "TEST_PASSES_SANITIZE_LEAK=true" is one of the cases where run-command.c in not carrying the abort() exit code upwards would have had that test passing before, but now it *actually* passes[1]. We should fix the lack of 1=1 mapping of SANITIZE=leak testing to actual leaks some other time, but it's an existing edge case, let's just mark the really-passing test as passing for now. 1. https://lore.kernel.org/git/220303.86fsnz5o9w.gmgdl@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
72 lines
1.8 KiB
Bash
Executable File
72 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='rev-list with .keep packs'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit loose &&
|
|
test_commit packed &&
|
|
test_commit kept &&
|
|
|
|
KEPT_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
|
|
refs/tags/kept
|
|
^refs/tags/packed
|
|
EOF
|
|
) &&
|
|
MISC_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
|
|
refs/tags/packed
|
|
^refs/tags/loose
|
|
EOF
|
|
) &&
|
|
|
|
touch .git/objects/pack/pack-$KEPT_PACK.keep
|
|
'
|
|
|
|
rev_list_objects () {
|
|
git rev-list "$@" >out &&
|
|
sort out
|
|
}
|
|
|
|
idx_objects () {
|
|
git show-index <$1 >expect-idx &&
|
|
cut -d" " -f2 <expect-idx | sort
|
|
}
|
|
|
|
test_expect_success '--no-kept-objects excludes trees and blobs in .keep packs' '
|
|
rev_list_objects --objects --all --no-object-names >kept &&
|
|
rev_list_objects --objects --all --no-object-names --no-kept-objects >no-kept &&
|
|
|
|
idx_objects .git/objects/pack/pack-$KEPT_PACK.idx >expect &&
|
|
comm -3 kept no-kept >actual &&
|
|
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--no-kept-objects excludes kept non-MIDX object' '
|
|
test_config core.multiPackIndex true &&
|
|
|
|
# Create a pack with just the commit object in pack, and do not mark it
|
|
# as kept (even though it appears in $KEPT_PACK, which does have a .keep
|
|
# file).
|
|
MIDX_PACK=$(git pack-objects .git/objects/pack/pack <<-EOF
|
|
$(git rev-parse kept)
|
|
EOF
|
|
) &&
|
|
|
|
# Write a MIDX containing all packs, but use the version of the commit
|
|
# at "kept" in a non-kept pack by touching $MIDX_PACK.
|
|
touch .git/objects/pack/pack-$MIDX_PACK.pack &&
|
|
git multi-pack-index write &&
|
|
|
|
rev_list_objects --objects --no-object-names --no-kept-objects HEAD >actual &&
|
|
(
|
|
idx_objects .git/objects/pack/pack-$MISC_PACK.idx &&
|
|
git rev-list --objects --no-object-names refs/tags/loose
|
|
) | sort >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|