midx: test a few commands that use get_all_packs

The new get_all_packs() method exposed the packfiles coverede by
a multi-pack-index. Before, the 'git cat-file --batch' and
'git count-objects' commands would skip objects in an environment
with a multi-pack-index.

Further, a reachability bitmap would be ignored if its pack-file
was covered by a multi-pack-index.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee 2018-08-20 16:52:06 +00:00 committed by Junio C Hamano
parent 454ea2e4d7
commit e9ab2ed7de

View File

@ -86,8 +86,14 @@ test_expect_success 'write midx with one v1 pack' '
'
midx_git_two_modes () {
git -c core.multiPackIndex=false $1 >expect &&
git -c core.multiPackIndex=true $1 >actual &&
if [ "$2" = "sorted" ]
then
git -c core.multiPackIndex=false $1 | sort >expect &&
git -c core.multiPackIndex=true $1 | sort >actual
else
git -c core.multiPackIndex=false $1 >expect &&
git -c core.multiPackIndex=true $1 >actual
fi &&
test_cmp expect actual
}
@ -95,7 +101,10 @@ compare_results_with_midx () {
MSG=$1
test_expect_success "check normal git operations: $MSG" '
midx_git_two_modes "rev-list --objects --all" &&
midx_git_two_modes "log --raw"
midx_git_two_modes "log --raw" &&
midx_git_two_modes "count-objects --verbose" &&
midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
'
}
@ -149,6 +158,12 @@ test_expect_success 'repack removes multi-pack-index' '
compare_results_with_midx "after repack"
test_expect_success 'multi-pack-index and pack-bitmap' '
git -c repack.writeBitmaps=true repack -ad &&
git multi-pack-index write &&
git rev-list --test-bitmap HEAD
'
test_expect_success 'multi-pack-index and alternates' '
git init --bare alt.git &&
echo $(pwd)/alt.git/objects >.git/objects/info/alternates &&