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/t1403-show-ref.sh | 197 ------------------------------------ 1 file changed, 197 deletions(-) delete mode 100755 third_party/git/t/t1403-show-ref.sh (limited to 'third_party/git/t/t1403-show-ref.sh') diff --git a/third_party/git/t/t1403-show-ref.sh b/third_party/git/t/t1403-show-ref.sh deleted file mode 100755 index 5d955c3bff2c..000000000000 --- a/third_party/git/t/t1403-show-ref.sh +++ /dev/null @@ -1,197 +0,0 @@ -#!/bin/sh - -test_description='show-ref' -. ./test-lib.sh - -test_expect_success setup ' - test_commit A && - git tag -f -a -m "annotated A" A && - git checkout -b side && - test_commit B && - git tag -f -a -m "annotated B" B && - git checkout master && - test_commit C && - git branch B A^0 -' - -test_expect_success 'show-ref' ' - echo $(git rev-parse refs/tags/A) refs/tags/A >expect && - - git show-ref A >actual && - test_cmp expect actual && - - git show-ref tags/A >actual && - test_cmp expect actual && - - git show-ref refs/tags/A >actual && - test_cmp expect actual && - - test_must_fail git show-ref D >actual && - test_must_be_empty actual -' - -test_expect_success 'show-ref -q' ' - git show-ref -q A >actual && - test_must_be_empty actual && - - git show-ref -q tags/A >actual && - test_must_be_empty actual && - - git show-ref -q refs/tags/A >actual && - test_must_be_empty actual && - - test_must_fail git show-ref -q D >actual && - test_must_be_empty actual -' - -test_expect_success 'show-ref --verify' ' - echo $(git rev-parse refs/tags/A) refs/tags/A >expect && - - git show-ref --verify refs/tags/A >actual && - test_cmp expect actual && - - test_must_fail git show-ref --verify A >actual && - test_must_be_empty actual && - - test_must_fail git show-ref --verify tags/A >actual && - test_must_be_empty actual && - - test_must_fail git show-ref --verify D >actual && - test_must_be_empty actual -' - -test_expect_success 'show-ref --verify -q' ' - git show-ref --verify -q refs/tags/A >actual && - test_must_be_empty actual && - - test_must_fail git show-ref --verify -q A >actual && - test_must_be_empty actual && - - test_must_fail git show-ref --verify -q tags/A >actual && - test_must_be_empty actual && - - test_must_fail git show-ref --verify -q D >actual && - test_must_be_empty actual -' - -test_expect_success 'show-ref -d' ' - { - echo $(git rev-parse refs/tags/A) refs/tags/A && - echo $(git rev-parse refs/tags/A^0) "refs/tags/A^{}" - echo $(git rev-parse refs/tags/C) refs/tags/C - } >expect && - git show-ref -d A C >actual && - test_cmp expect actual && - - git show-ref -d tags/A tags/C >actual && - test_cmp expect actual && - - git show-ref -d refs/tags/A refs/tags/C >actual && - test_cmp expect actual && - - git show-ref --verify -d refs/tags/A refs/tags/C >actual && - test_cmp expect actual && - - echo $(git rev-parse refs/heads/master) refs/heads/master >expect && - git show-ref -d master >actual && - test_cmp expect actual && - - git show-ref -d heads/master >actual && - test_cmp expect actual && - - git show-ref -d refs/heads/master >actual && - test_cmp expect actual && - - git show-ref -d --verify refs/heads/master >actual && - test_cmp expect actual && - - test_must_fail git show-ref -d --verify master >actual && - test_must_be_empty actual && - - test_must_fail git show-ref -d --verify heads/master >actual && - test_must_be_empty actual && - - test_must_fail git show-ref --verify -d A C >actual && - test_must_be_empty actual && - - test_must_fail git show-ref --verify -d tags/A tags/C >actual && - test_must_be_empty actual - -' - -test_expect_success 'show-ref --heads, --tags, --head, pattern' ' - for branch in B master side - do - echo $(git rev-parse refs/heads/$branch) refs/heads/$branch - done >expect.heads && - git show-ref --heads >actual && - test_cmp expect.heads actual && - - for tag in A B C - do - echo $(git rev-parse refs/tags/$tag) refs/tags/$tag - done >expect.tags && - git show-ref --tags >actual && - test_cmp expect.tags actual && - - cat expect.heads expect.tags >expect && - git show-ref --heads --tags >actual && - test_cmp expect actual && - - { - echo $(git rev-parse HEAD) HEAD && - cat expect.heads expect.tags - } >expect && - git show-ref --heads --tags --head >actual && - test_cmp expect actual && - - { - echo $(git rev-parse HEAD) HEAD && - echo $(git rev-parse refs/heads/B) refs/heads/B - echo $(git rev-parse refs/tags/B) refs/tags/B - } >expect && - git show-ref --head B >actual && - test_cmp expect actual && - - { - echo $(git rev-parse HEAD) HEAD && - echo $(git rev-parse refs/heads/B) refs/heads/B - echo $(git rev-parse refs/tags/B) refs/tags/B - echo $(git rev-parse refs/tags/B^0) "refs/tags/B^{}" - } >expect && - git show-ref --head -d B >actual && - test_cmp expect actual -' - -test_expect_success 'show-ref --verify HEAD' ' - echo $(git rev-parse HEAD) HEAD >expect && - git show-ref --verify HEAD >actual && - test_cmp expect actual && - - git show-ref --verify -q HEAD >actual && - test_must_be_empty actual -' - -test_expect_success 'show-ref --verify with dangling ref' ' - sha1_file() { - echo "$*" | sed "s#..#.git/objects/&/#" - } && - - remove_object() { - file=$(sha1_file "$*") && - test -e "$file" && - rm -f "$file" - } && - - test_when_finished "rm -rf dangling" && - ( - git init dangling && - cd dangling && - test_commit dangling && - sha=$(git rev-parse refs/tags/dangling) && - remove_object $sha && - test_must_fail git show-ref --verify refs/tags/dangling - ) -' - -test_done -- cgit 1.4.1