mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
a0c9016abd
A filter line in a request to upload-pack filters out objects regardless
of whether they are directly referenced by a "want" line or not. This
means that cloning with "--filter=blob:none" (or another filter that
excludes blobs) from a repository with at least one ref pointing to a
blob (for example, the Git repository itself) results in output like the
following:
error: missing object referenced by 'refs/tags/junio-gpg-pub'
and if that particular blob is not referenced by a fetched tree, the
resulting clone fails fsck because there is no object from the remote to
vouch that the missing object is a promisor object.
Update both the protocol and the upload-pack implementation to include
all explicitly specified "want" objects in the packfile regardless of
the filter specification.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
391 lines
10 KiB
Bash
Executable file
391 lines
10 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 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
|