diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t5317-pack-objects-filter-objects.sh | |
parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t5317-pack-objects-filter-objects.sh')
-rwxr-xr-x | third_party/git/t/t5317-pack-objects-filter-objects.sh | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/third_party/git/t/t5317-pack-objects-filter-objects.sh b/third_party/git/t/t5317-pack-objects-filter-objects.sh index dc0446574b3f..2d2f5d0229ce 100755 --- a/third_party/git/t/t5317-pack-objects-filter-objects.sh +++ b/third_party/git/t/t5317-pack-objects-filter-objects.sh @@ -45,7 +45,12 @@ test_expect_success 'verify blob:none packfile has no blobs' ' git -C r1 index-pack ../filter.pack && git -C r1 verify-pack -v ../filter.pack >verify_result && - ! grep blob verify_result + grep blob verify_result | + 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' ' @@ -67,8 +72,7 @@ test_expect_success 'get an error for missing tree object' ' echo foo >r5/foo && git -C r5 add foo && git -C r5 commit -m "foo" && - git -C r5 rev-parse HEAD^{tree} >tree && - del=$(sed "s|..|&/|" tree) && + del=$(git -C r5 rev-parse HEAD^{tree} | sed "s|..|&/|") && rm r5/.git/objects/$del && test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF && HEAD @@ -144,7 +148,12 @@ test_expect_success 'verify blob:limit=500 omits all blobs' ' git -C r2 index-pack ../filter.pack && git -C r2 verify-pack -v ../filter.pack >verify_result && - ! grep blob verify_result + grep blob verify_result | + awk -f print_1.awk | + sort >observed && + + nr=$(wc -l <observed) && + test 0 -eq $nr ' test_expect_success 'verify blob:limit=1000' ' @@ -154,7 +163,12 @@ test_expect_success 'verify blob:limit=1000' ' git -C r2 index-pack ../filter.pack && git -C r2 verify-pack -v ../filter.pack >verify_result && - ! grep blob verify_result + grep blob verify_result | + awk -f print_1.awk | + sort >observed && + + nr=$(wc -l <observed) && + test 0 -eq $nr ' test_expect_success 'verify blob:limit=1001' ' @@ -216,9 +230,10 @@ test_expect_success 'verify explicitly specifying oversized blob in input' ' awk -f print_2.awk ls_files_result | sort >expected && - echo HEAD >objects && - git -C r2 rev-parse HEAD:large.10000 >>objects && - git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack && + git -C r2 pack-objects --revs --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 >verify_result && @@ -362,8 +377,7 @@ test_expect_success 'verify sparse:oid=OID' ' awk -f print_2.awk ls_files_result | sort >expected && - git -C r4 ls-files -s pattern >staged && - oid=$(awk -f print_2.awk staged) && + oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) && git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF && HEAD EOF |