bc5975d24f
Teach list-objects the "tree:0" filter which allows for filtering out all tree and blob objects (unless other objects are explicitly specified by the user). The purpose of this patch is to allow smaller partial clones. The name of this filter - tree:0 - does not explicitly specify that it also filters out all blobs, but this should not cause much confusion because blobs are not at all useful without the trees that refer to them. I also considered only:commits as a name, but this is inaccurate because it suggests that annotated tags are omitted, but actually they are included. The name "tree:0" allows later filtering based on depth, i.e. "tree:1" would filter out all but the root tree and blobs. In order to avoid confusion between 0 and capital O, the documentation was worded in a somewhat round-about way that also hints at this future improvement to the feature. Signed-off-by: Matthew DeVore <matvore@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
433 lines
12 KiB
Bash
Executable File
433 lines
12 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git pack-objects using object filtering'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# Test blob:none filter.
|
|
|
|
test_expect_success 'setup r1' '
|
|
echo "{print \$1}" >print_1.awk &&
|
|
echo "{print \$2}" >print_2.awk &&
|
|
|
|
git init r1 &&
|
|
for n in 1 2 3 4 5
|
|
do
|
|
echo "This is file: $n" > r1/file.$n
|
|
git -C r1 add file.$n
|
|
git -C r1 commit -m "$n"
|
|
done
|
|
'
|
|
|
|
test_expect_success 'verify blob count in normal packfile' '
|
|
git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r1 pack-objects --rev --stdout >all.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r1 index-pack ../all.pack &&
|
|
git -C r1 verify-pack -v ../all.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify blob:none packfile has no blobs' '
|
|
git -C r1 pack-objects --rev --stdout --filter=blob:none >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r1 index-pack ../filter.pack &&
|
|
git -C r1 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
nr=$(wc -l <observed) &&
|
|
test 0 -eq $nr
|
|
'
|
|
|
|
test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '
|
|
git -C r1 verify-pack -v ../all.pack \
|
|
| grep -E "commit|tree" \
|
|
| awk -f print_1.awk \
|
|
| sort >expected &&
|
|
git -C r1 verify-pack -v ../filter.pack \
|
|
| grep -E "commit|tree" \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'get an error for missing tree object' '
|
|
git init r5 &&
|
|
echo foo >r5/foo &&
|
|
git -C r5 add foo &&
|
|
git -C r5 commit -m "foo" &&
|
|
del=$(git -C r5 rev-parse HEAD^{tree} | sed "s|..|&/|") &&
|
|
rm r5/.git/objects/$del &&
|
|
test_must_fail git -C r5 pack-objects --rev --stdout 2>bad_tree <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
grep -q "bad tree object" bad_tree
|
|
'
|
|
|
|
test_expect_success 'setup for tests of tree:0' '
|
|
mkdir r1/subtree &&
|
|
echo "This is a file in a subtree" >r1/subtree/file &&
|
|
git -C r1 add subtree/file &&
|
|
git -C r1 commit -m subtree
|
|
'
|
|
|
|
test_expect_success 'verify tree:0 packfile has no blobs or trees' '
|
|
git -C r1 pack-objects --rev --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r1 index-pack ../commitsonly.pack &&
|
|
git -C r1 verify-pack -v ../commitsonly.pack >objs &&
|
|
! grep -E "tree|blob" objs
|
|
'
|
|
|
|
test_expect_success 'grab tree directly when using tree:0' '
|
|
# We should get the tree specified directly but not its blobs or subtrees.
|
|
git -C r1 pack-objects --rev --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
|
|
HEAD:
|
|
EOF
|
|
git -C r1 index-pack ../commitsonly.pack &&
|
|
git -C r1 verify-pack -v ../commitsonly.pack >objs &&
|
|
awk "/tree|blob/{print \$1}" objs >trees_and_blobs &&
|
|
git -C r1 rev-parse HEAD: >expected &&
|
|
test_cmp expected trees_and_blobs
|
|
'
|
|
|
|
# Test blob:limit=<n>[kmg] filter.
|
|
# We boundary test around the size parameter. The filter is strictly less than
|
|
# the value, so size 500 and 1000 should have the same results, but 1001 should
|
|
# filter more.
|
|
|
|
test_expect_success 'setup r2' '
|
|
git init r2 &&
|
|
for n in 1000 10000
|
|
do
|
|
printf "%"$n"s" X > r2/large.$n
|
|
git -C r2 add large.$n
|
|
git -C r2 commit -m "$n"
|
|
done
|
|
'
|
|
|
|
test_expect_success 'verify blob count in normal packfile' '
|
|
git -C r2 ls-files -s large.1000 large.10000 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r2 pack-objects --rev --stdout >all.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r2 index-pack ../all.pack &&
|
|
git -C r2 verify-pack -v ../all.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify blob:limit=500 omits all blobs' '
|
|
git -C r2 pack-objects --rev --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r2 index-pack ../filter.pack &&
|
|
git -C r2 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
nr=$(wc -l <observed) &&
|
|
test 0 -eq $nr
|
|
'
|
|
|
|
test_expect_success 'verify blob:limit=1000' '
|
|
git -C r2 pack-objects --rev --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r2 index-pack ../filter.pack &&
|
|
git -C r2 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
nr=$(wc -l <observed) &&
|
|
test 0 -eq $nr
|
|
'
|
|
|
|
test_expect_success 'verify blob:limit=1001' '
|
|
git -C r2 ls-files -s large.1000 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r2 pack-objects --rev --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r2 index-pack ../filter.pack &&
|
|
git -C r2 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify blob:limit=10001' '
|
|
git -C r2 ls-files -s large.1000 large.10000 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r2 pack-objects --rev --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r2 index-pack ../filter.pack &&
|
|
git -C r2 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify blob:limit=1k' '
|
|
git -C r2 ls-files -s large.1000 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r2 index-pack ../filter.pack &&
|
|
git -C r2 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify explicitly specifying oversized blob in input' '
|
|
git -C r2 ls-files -s large.1000 large.10000 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
|
|
HEAD
|
|
$(git -C r2 rev-parse HEAD:large.10000)
|
|
EOF
|
|
git -C r2 index-pack ../filter.pack &&
|
|
git -C r2 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify blob:limit=1m' '
|
|
git -C r2 ls-files -s large.1000 large.10000 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r2 pack-objects --rev --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r2 index-pack ../filter.pack &&
|
|
git -C r2 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify normal and blob:limit packfiles have same commits/trees' '
|
|
git -C r2 verify-pack -v ../all.pack \
|
|
| grep -E "commit|tree" \
|
|
| awk -f print_1.awk \
|
|
| sort >expected &&
|
|
git -C r2 verify-pack -v ../filter.pack \
|
|
| grep -E "commit|tree" \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
# Test sparse:path=<path> filter.
|
|
# Use a local file containing a sparse-checkout specification to filter
|
|
# out blobs not required for the corresponding sparse-checkout. We do not
|
|
# require sparse-checkout to actually be enabled.
|
|
|
|
test_expect_success 'setup r3' '
|
|
git init r3 &&
|
|
mkdir r3/dir1 &&
|
|
for n in sparse1 sparse2
|
|
do
|
|
echo "This is file: $n" > r3/$n
|
|
git -C r3 add $n
|
|
echo "This is file: dir1/$n" > r3/dir1/$n
|
|
git -C r3 add dir1/$n
|
|
done &&
|
|
git -C r3 commit -m "sparse" &&
|
|
echo dir1/ >pattern1 &&
|
|
echo sparse1 >pattern2
|
|
'
|
|
|
|
test_expect_success 'verify blob count in normal packfile' '
|
|
git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r3 pack-objects --rev --stdout >all.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r3 index-pack ../all.pack &&
|
|
git -C r3 verify-pack -v ../all.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify sparse:path=pattern1' '
|
|
git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern1 >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r3 index-pack ../filter.pack &&
|
|
git -C r3 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify normal and sparse:path=pattern1 packfiles have same commits/trees' '
|
|
git -C r3 verify-pack -v ../all.pack \
|
|
| grep -E "commit|tree" \
|
|
| awk -f print_1.awk \
|
|
| sort >expected &&
|
|
git -C r3 verify-pack -v ../filter.pack \
|
|
| grep -E "commit|tree" \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify sparse:path=pattern2' '
|
|
git -C r3 ls-files -s sparse1 dir1/sparse1 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern2 >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r3 index-pack ../filter.pack &&
|
|
git -C r3 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify normal and sparse:path=pattern2 packfiles have same commits/trees' '
|
|
git -C r3 verify-pack -v ../all.pack \
|
|
| grep -E "commit|tree" \
|
|
| awk -f print_1.awk \
|
|
| sort >expected &&
|
|
git -C r3 verify-pack -v ../filter.pack \
|
|
| grep -E "commit|tree" \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
# Test sparse:oid=<oid-ish> filter.
|
|
# Like sparse:path, but we get the sparse-checkout specification from
|
|
# a blob rather than a file on disk.
|
|
|
|
test_expect_success 'setup r4' '
|
|
git init r4 &&
|
|
mkdir r4/dir1 &&
|
|
for n in sparse1 sparse2
|
|
do
|
|
echo "This is file: $n" > r4/$n
|
|
git -C r4 add $n
|
|
echo "This is file: dir1/$n" > r4/dir1/$n
|
|
git -C r4 add dir1/$n
|
|
done &&
|
|
echo dir1/ >r4/pattern &&
|
|
git -C r4 add pattern &&
|
|
git -C r4 commit -m "pattern"
|
|
'
|
|
|
|
test_expect_success 'verify blob count in normal packfile' '
|
|
git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r4 pack-objects --rev --stdout >all.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r4 index-pack ../all.pack &&
|
|
git -C r4 verify-pack -v ../all.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify sparse:oid=OID' '
|
|
git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
|
|
git -C r4 pack-objects --rev --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r4 index-pack ../filter.pack &&
|
|
git -C r4 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
test_expect_success 'verify sparse:oid=oid-ish' '
|
|
git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
git -C r4 pack-objects --rev --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
|
|
HEAD
|
|
EOF
|
|
git -C r4 index-pack ../filter.pack &&
|
|
git -C r4 verify-pack -v ../filter.pack \
|
|
| grep blob \
|
|
| awk -f print_1.awk \
|
|
| sort >observed &&
|
|
test_cmp observed expected
|
|
'
|
|
|
|
# Delete some loose objects and use pack-objects, but WITHOUT any filtering.
|
|
# This models previously omitted objects that we did not receive.
|
|
|
|
test_expect_success 'setup r1 - delete loose blobs' '
|
|
git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
|
|
| awk -f print_2.awk \
|
|
| sort >expected &&
|
|
for id in `cat expected | sed "s|..|&/|"`
|
|
do
|
|
rm r1/.git/objects/$id
|
|
done
|
|
'
|
|
|
|
test_expect_success 'verify pack-objects fails w/ missing objects' '
|
|
test_must_fail git -C r1 pack-objects --rev --stdout >miss.pack <<-EOF
|
|
HEAD
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'verify pack-objects fails w/ --missing=error' '
|
|
test_must_fail git -C r1 pack-objects --rev --stdout --missing=error >miss.pack <<-EOF
|
|
HEAD
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'verify pack-objects w/ --missing=allow-any' '
|
|
git -C r1 pack-objects --rev --stdout --missing=allow-any >miss.pack <<-EOF
|
|
HEAD
|
|
EOF
|
|
'
|
|
|
|
test_done
|