Merge branch 'md/filter-trees'

diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index c093eb89130e726e43a45c02be804ec7cf358e92..24541ea137517354a8b738bdef34728b49f2850e 100755 (executable)
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -20,8 +20,9 @@ test_expect_success 'setup r1' '
 '
 
 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 |
+       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+               >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r1 pack-objects --rev --stdout >all.pack <<-EOF &&
@@ -29,8 +30,8 @@ test_expect_success 'verify blob count in normal packfile' '
        EOF
        git -C r1 index-pack ../all.pack &&
 
-       git -C r1 verify-pack -v ../all.pack |
-       grep blob |
+       git -C r1 verify-pack -v ../all.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -43,8 +44,8 @@ test_expect_success 'verify blob:none packfile has no blobs' '
        EOF
        git -C r1 index-pack ../filter.pack &&
 
-       git -C r1 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r1 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -53,19 +54,60 @@ test_expect_success 'verify blob:none packfile has no blobs' '
 '
 
 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" |
+       git -C r1 verify-pack -v ../all.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >expected &&
 
-       git -C r1 verify-pack -v ../filter.pack |
-       grep -E "commit|tree" |
+       git -C r1 verify-pack -v ../filter.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
        test_cmp expected observed
 '
 
+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 "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
@@ -82,8 +124,8 @@ test_expect_success 'setup r2' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '
-       git -C r2 ls-files -s large.1000 large.10000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout >all.pack <<-EOF &&
@@ -91,8 +133,8 @@ test_expect_success 'verify blob count in normal packfile' '
        EOF
        git -C r2 index-pack ../all.pack &&
 
-       git -C r2 verify-pack -v ../all.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../all.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -105,8 +147,8 @@ test_expect_success 'verify blob:limit=500 omits all blobs' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -120,8 +162,8 @@ test_expect_success 'verify blob:limit=1000' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -130,8 +172,8 @@ test_expect_success 'verify blob:limit=1000' '
 '
 
 test_expect_success 'verify blob:limit=1001' '
-       git -C r2 ls-files -s large.1000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
@@ -139,8 +181,8 @@ test_expect_success 'verify blob:limit=1001' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -148,8 +190,8 @@ test_expect_success 'verify blob:limit=1001' '
 '
 
 test_expect_success 'verify blob:limit=10001' '
-       git -C r2 ls-files -s large.1000 large.10000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
@@ -157,8 +199,8 @@ test_expect_success 'verify blob:limit=10001' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -166,8 +208,8 @@ test_expect_success 'verify blob:limit=10001' '
 '
 
 test_expect_success 'verify blob:limit=1k' '
-       git -C r2 ls-files -s large.1000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
@@ -175,8 +217,8 @@ test_expect_success 'verify blob:limit=1k' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -184,8 +226,8 @@ test_expect_success 'verify blob:limit=1k' '
 '
 
 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 |
+       git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
@@ -194,8 +236,8 @@ test_expect_success 'verify explicitly specifying oversized blob in input' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -203,8 +245,8 @@ test_expect_success 'verify explicitly specifying oversized blob in input' '
 '
 
 test_expect_success 'verify blob:limit=1m' '
-       git -C r2 ls-files -s large.1000 large.10000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
@@ -212,8 +254,8 @@ test_expect_success 'verify blob:limit=1m' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -221,13 +263,13 @@ test_expect_success 'verify blob:limit=1m' '
 '
 
 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" |
+       git -C r2 verify-pack -v ../all.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >expected &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep -E "commit|tree" |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -255,8 +297,9 @@ test_expect_success 'setup r3' '
 '
 
 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 |
+       git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+               >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r3 pack-objects --rev --stdout >all.pack <<-EOF &&
@@ -264,8 +307,8 @@ test_expect_success 'verify blob count in normal packfile' '
        EOF
        git -C r3 index-pack ../all.pack &&
 
-       git -C r3 verify-pack -v ../all.pack |
-       grep blob |
+       git -C r3 verify-pack -v ../all.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -273,8 +316,8 @@ test_expect_success 'verify blob count in normal packfile' '
 '
 
 test_expect_success 'verify sparse:path=pattern1' '
-       git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 |
-       awk -f print_2.awk |
+       git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern1 >filter.pack <<-EOF &&
@@ -282,8 +325,8 @@ test_expect_success 'verify sparse:path=pattern1' '
        EOF
        git -C r3 index-pack ../filter.pack &&
 
-       git -C r3 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r3 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -291,13 +334,13 @@ test_expect_success 'verify sparse:path=pattern1' '
 '
 
 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" |
+       git -C r3 verify-pack -v ../all.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >expected &&
 
-       git -C r3 verify-pack -v ../filter.pack |
-       grep -E "commit|tree" |
+       git -C r3 verify-pack -v ../filter.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -305,8 +348,8 @@ test_expect_success 'verify normal and sparse:path=pattern1 packfiles have same
 '
 
 test_expect_success 'verify sparse:path=pattern2' '
-       git -C r3 ls-files -s sparse1 dir1/sparse1 |
-       awk -f print_2.awk |
+       git -C r3 ls-files -s sparse1 dir1/sparse1 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern2 >filter.pack <<-EOF &&
@@ -314,8 +357,8 @@ test_expect_success 'verify sparse:path=pattern2' '
        EOF
        git -C r3 index-pack ../filter.pack &&
 
-       git -C r3 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r3 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -323,13 +366,13 @@ test_expect_success 'verify sparse:path=pattern2' '
 '
 
 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" |
+       git -C r3 verify-pack -v ../all.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >expected &&
 
-       git -C r3 verify-pack -v ../filter.pack |
-       grep -E "commit|tree" |
+       git -C r3 verify-pack -v ../filter.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -356,8 +399,9 @@ test_expect_success 'setup r4' '
 '
 
 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 |
+       git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+               >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r4 pack-objects --rev --stdout >all.pack <<-EOF &&
@@ -365,8 +409,8 @@ test_expect_success 'verify blob count in normal packfile' '
        EOF
        git -C r4 index-pack ../all.pack &&
 
-       git -C r4 verify-pack -v ../all.pack |
-       grep blob |
+       git -C r4 verify-pack -v ../all.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -374,8 +418,8 @@ test_expect_success 'verify blob count in normal packfile' '
 '
 
 test_expect_success 'verify sparse:oid=OID' '
-       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
-       awk -f print_2.awk |
+       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
@@ -384,8 +428,8 @@ test_expect_success 'verify sparse:oid=OID' '
        EOF
        git -C r4 index-pack ../filter.pack &&
 
-       git -C r4 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r4 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -393,8 +437,8 @@ test_expect_success 'verify sparse:oid=OID' '
 '
 
 test_expect_success 'verify sparse:oid=oid-ish' '
-       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
-       awk -f print_2.awk |
+       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r4 pack-objects --rev --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
@@ -402,8 +446,8 @@ test_expect_success 'verify sparse:oid=oid-ish' '
        EOF
        git -C r4 index-pack ../filter.pack &&
 
-       git -C r4 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r4 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -414,8 +458,9 @@ test_expect_success 'verify sparse:oid=oid-ish' '
 # 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 |
+       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+               >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        for id in `cat expected | sed "s|..|&/|"`