From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead 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 --- third_party/git/t/t3211-peel-ref.sh | 73 ------------------------------------- 1 file changed, 73 deletions(-) delete mode 100755 third_party/git/t/t3211-peel-ref.sh (limited to 'third_party/git/t/t3211-peel-ref.sh') diff --git a/third_party/git/t/t3211-peel-ref.sh b/third_party/git/t/t3211-peel-ref.sh deleted file mode 100755 index 3b7caca4212e..000000000000 --- a/third_party/git/t/t3211-peel-ref.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -test_description='tests for the peel_ref optimization of packed-refs' -. ./test-lib.sh - -test_expect_success 'create annotated tag in refs/tags' ' - test_commit base && - git tag -m annotated foo -' - -test_expect_success 'create annotated tag outside of refs/tags' ' - git update-ref refs/outside/foo refs/tags/foo -' - -# This matches show-ref's output -print_ref() { - echo "$(git rev-parse "$1") $1" -} - -test_expect_success 'set up expected show-ref output' ' - { - print_ref "refs/heads/master" && - print_ref "refs/outside/foo" && - print_ref "refs/outside/foo^{}" && - print_ref "refs/tags/base" && - print_ref "refs/tags/foo" && - print_ref "refs/tags/foo^{}" - } >expect -' - -test_expect_success 'refs are peeled outside of refs/tags (loose)' ' - git show-ref -d >actual && - test_cmp expect actual -' - -test_expect_success 'refs are peeled outside of refs/tags (packed)' ' - git pack-refs --all && - git show-ref -d >actual && - test_cmp expect actual -' - -test_expect_success 'create old-style pack-refs without fully-peeled' ' - # Git no longer writes without fully-peeled, so we just write our own - # from scratch; we could also munge the existing file to remove the - # fully-peeled bits, but that seems even more prone to failure, - # especially if the format ever changes again. At least this way we - # know we are emulating exactly what an older git would have written. - { - echo "# pack-refs with: peeled " && - print_ref "refs/heads/master" && - print_ref "refs/outside/foo" && - print_ref "refs/tags/base" && - print_ref "refs/tags/foo" && - echo "^$(git rev-parse "refs/tags/foo^{}")" - } >tmp && - mv tmp .git/packed-refs -' - -test_expect_success 'refs are peeled outside of refs/tags (old packed)' ' - git show-ref -d >actual && - test_cmp expect actual -' - -test_expect_success 'peeled refs survive deletion of packed ref' ' - git pack-refs --all && - cp .git/packed-refs fully-peeled && - git branch yadda && - git pack-refs --all && - git branch -d yadda && - test_cmp fully-peeled .git/packed-refs -' - -test_done -- cgit 1.4.1