diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t5322-pack-objects-sparse.sh | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/t5322-pack-objects-sparse.sh')
-rwxr-xr-x | third_party/git/t/t5322-pack-objects-sparse.sh | 138 |
1 files changed, 0 insertions, 138 deletions
diff --git a/third_party/git/t/t5322-pack-objects-sparse.sh b/third_party/git/t/t5322-pack-objects-sparse.sh deleted file mode 100755 index a581eaf52936..000000000000 --- a/third_party/git/t/t5322-pack-objects-sparse.sh +++ /dev/null @@ -1,138 +0,0 @@ -#!/bin/sh - -test_description='pack-objects object selection using sparse algorithm' -. ./test-lib.sh - -test_expect_success 'setup repo' ' - test_commit initial && - for i in $(test_seq 1 3) - do - mkdir f$i && - for j in $(test_seq 1 3) - do - mkdir f$i/f$j && - echo $j >f$i/f$j/data.txt - done - done && - git add . && - git commit -m "Initialized trees" && - for i in $(test_seq 1 3) - do - git checkout -b topic$i master && - echo change-$i >f$i/f$i/data.txt && - git commit -a -m "Changed f$i/f$i/data.txt" - done && - cat >packinput.txt <<-EOF && - topic1 - ^topic2 - ^topic3 - EOF - git rev-parse \ - topic1 \ - topic1^{tree} \ - topic1:f1 \ - topic1:f1/f1 \ - topic1:f1/f1/data.txt | sort >expect_objects.txt -' - -test_expect_success 'non-sparse pack-objects' ' - git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack && - git index-pack -o nonsparse.idx nonsparse.pack && - git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt && - test_cmp expect_objects.txt nonsparse_objects.txt -' - -test_expect_success 'sparse pack-objects' ' - git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack && - git index-pack -o sparse.idx sparse.pack && - git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt && - test_cmp expect_objects.txt sparse_objects.txt -' - -test_expect_success 'duplicate a folder from f3 and commit to topic1' ' - git checkout topic1 && - echo change-3 >f3/f3/data.txt && - git commit -a -m "Changed f3/f3/data.txt" && - git rev-parse \ - topic1~1 \ - topic1~1^{tree} \ - topic1^{tree} \ - topic1 \ - topic1:f1 \ - topic1:f1/f1 \ - topic1:f1/f1/data.txt | sort >required_objects.txt -' - -test_expect_success 'non-sparse pack-objects' ' - git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack && - git index-pack -o nonsparse.idx nonsparse.pack && - git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt && - comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt && - test_cmp required_objects.txt nonsparse_required_objects.txt -' - -test_expect_success 'sparse pack-objects' ' - git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack && - git index-pack -o sparse.idx sparse.pack && - git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt && - comm -1 -2 required_objects.txt sparse_objects.txt >sparse_required_objects.txt && - test_cmp required_objects.txt sparse_required_objects.txt -' - -# Demonstrate that the algorithms differ when we copy a tree wholesale -# from one folder to another. - -test_expect_success 'duplicate a folder from f1 into f3' ' - mkdir f3/f4 && - cp -r f1/f1/* f3/f4 && - git add f3/f4 && - git commit -m "Copied f1/f1 to f3/f4" && - cat >packinput.txt <<-EOF && - topic1 - ^topic1~1 - EOF - git rev-parse \ - topic1 \ - topic1^{tree} \ - topic1:f3 | sort >required_objects.txt -' - -test_expect_success 'non-sparse pack-objects' ' - git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack && - git index-pack -o nonsparse.idx nonsparse.pack && - git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt && - comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt && - test_cmp required_objects.txt nonsparse_required_objects.txt -' - -# --sparse is enabled by default by pack.useSparse -test_expect_success 'sparse pack-objects' ' - GIT_TEST_PACK_SPARSE=-1 && - git rev-parse \ - topic1 \ - topic1^{tree} \ - topic1:f3 \ - topic1:f3/f4 \ - topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt && - git pack-objects --stdout --revs <packinput.txt >sparse.pack && - git index-pack -o sparse.idx sparse.pack && - git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt && - test_cmp expect_sparse_objects.txt sparse_objects.txt -' - -test_expect_success 'pack.useSparse enables algorithm' ' - git config pack.useSparse true && - git pack-objects --stdout --revs <packinput.txt >sparse.pack && - git index-pack -o sparse.idx sparse.pack && - git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt && - test_cmp expect_sparse_objects.txt sparse_objects.txt -' - -test_expect_success 'pack.useSparse overridden' ' - git pack-objects --stdout --revs --no-sparse <packinput.txt >sparse.pack && - git index-pack -o sparse.idx sparse.pack && - git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt && - test_cmp required_objects.txt sparse_objects.txt -' - -test_done |