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/t4126-apply-empty.sh | 57 ---------------------------------- 1 file changed, 57 deletions(-) delete mode 100755 third_party/git/t/t4126-apply-empty.sh (limited to 'third_party/git/t/t4126-apply-empty.sh') diff --git a/third_party/git/t/t4126-apply-empty.sh b/third_party/git/t/t4126-apply-empty.sh deleted file mode 100755 index ceb6a79fe0c8..000000000000 --- a/third_party/git/t/t4126-apply-empty.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -test_description='apply empty' - -. ./test-lib.sh - -test_expect_success setup ' - >empty && - git add empty && - test_tick && - git commit -m initial && - for i in a b c d e - do - echo $i - done >empty && - cat empty >expect && - git diff | - sed -e "/^diff --git/d" \ - -e "/^index /d" \ - -e "s|a/empty|empty.orig|" \ - -e "s|b/empty|empty|" >patch0 && - sed -e "s|empty|missing|" patch0 >patch1 && - >empty && - git update-index --refresh -' - -test_expect_success 'apply empty' ' - git reset --hard && - rm -f missing && - git apply patch0 && - test_cmp expect empty -' - -test_expect_success 'apply --index empty' ' - git reset --hard && - rm -f missing && - git apply --index patch0 && - test_cmp expect empty && - git diff --exit-code -' - -test_expect_success 'apply create' ' - git reset --hard && - rm -f missing && - git apply patch1 && - test_cmp expect missing -' - -test_expect_success 'apply --index create' ' - git reset --hard && - rm -f missing && - git apply --index patch1 && - test_cmp expect missing && - git diff --exit-code -' - -test_done -- cgit 1.4.1