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/t5306-pack-nobase.sh | 80 ---------------------------------- 1 file changed, 80 deletions(-) delete mode 100755 third_party/git/t/t5306-pack-nobase.sh (limited to 'third_party/git/t/t5306-pack-nobase.sh') diff --git a/third_party/git/t/t5306-pack-nobase.sh b/third_party/git/t/t5306-pack-nobase.sh deleted file mode 100755 index f4931c0c2a40..000000000000 --- a/third_party/git/t/t5306-pack-nobase.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2008 Google Inc. -# - -test_description='git-pack-object with missing base - -' -. ./test-lib.sh - -# Create A-B chain -# -test_expect_success \ - 'setup base' \ - 'for a in a b c d e f g h i; do echo $a >>text; done && - echo side >side && - git update-index --add text side && - A=$(echo A | git commit-tree $(git write-tree)) && - - echo m >>text && - git update-index text && - B=$(echo B | git commit-tree $(git write-tree) -p $A) && - git update-ref HEAD $B - ' - -# Create repository with C whose parent is B. -# Repository contains C, C^{tree}, C:text, B, B^{tree}. -# Repository is missing B:text (best delta base for C:text). -# Repository is missing A (parent of B). -# Repository is missing A:side. -# -test_expect_success \ - 'setup patch_clone' \ - 'base_objects=$(pwd)/.git/objects && - (mkdir patch_clone && - cd patch_clone && - git init && - echo "$base_objects" >.git/objects/info/alternates && - echo q >>text && - git read-tree $B && - git update-index text && - git update-ref HEAD $(echo C | git commit-tree $(git write-tree) -p $B) && - rm .git/objects/info/alternates && - - git --git-dir=../.git cat-file commit $B | - git hash-object -t commit -w --stdin && - - git --git-dir=../.git cat-file tree "$B^{tree}" | - git hash-object -t tree -w --stdin - ) && - C=$(git --git-dir=patch_clone/.git rev-parse HEAD) - ' - -# Clone patch_clone indirectly by cloning base and fetching. -# -test_expect_success \ - 'indirectly clone patch_clone' \ - '(mkdir user_clone && - cd user_clone && - git init && - git pull ../.git && - test $(git rev-parse HEAD) = $B && - - git pull ../patch_clone/.git && - test $(git rev-parse HEAD) = $C - ) - ' - -# Cloning the patch_clone directly should fail. -# -test_expect_success \ - 'clone of patch_clone is incomplete' \ - '(mkdir user_direct && - cd user_direct && - git init && - test_must_fail git fetch ../patch_clone/.git - ) - ' - -test_done -- cgit 1.4.1