From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
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/t3431-rebase-fork-point.sh | 77 ----------------------------
 1 file changed, 77 deletions(-)
 delete mode 100755 third_party/git/t/t3431-rebase-fork-point.sh

(limited to 'third_party/git/t/t3431-rebase-fork-point.sh')

diff --git a/third_party/git/t/t3431-rebase-fork-point.sh b/third_party/git/t/t3431-rebase-fork-point.sh
deleted file mode 100755
index 172562789e..0000000000
--- a/third_party/git/t/t3431-rebase-fork-point.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 Denton Liu
-#
-
-test_description='git rebase --fork-point test'
-
-. ./test-lib.sh
-
-# A---B---D---E    (master)
-#      \
-#       C*---F---G (side)
-#
-# C was formerly part of master but master was rewound to remove C
-#
-test_expect_success setup '
-	test_commit A &&
-	test_commit B &&
-	test_commit C &&
-	git branch -t side &&
-	git reset --hard HEAD^ &&
-	test_commit D &&
-	test_commit E &&
-	git checkout side &&
-	test_commit F &&
-	test_commit G
-'
-
-test_rebase () {
-	expected="$1" &&
-	shift &&
-	test_expect_success "git rebase $*" "
-		git checkout master &&
-		git reset --hard E &&
-		git checkout side &&
-		git reset --hard G &&
-		git rebase $* &&
-		test_write_lines $expected >expect &&
-		git log --pretty=%s >actual &&
-		test_cmp expect actual
-	"
-}
-
-test_rebase 'G F E D B A'
-test_rebase 'G F D B A' --onto D
-test_rebase 'G F B A' --keep-base
-test_rebase 'G F C E D B A' --no-fork-point
-test_rebase 'G F C D B A' --no-fork-point --onto D
-test_rebase 'G F C B A' --no-fork-point --keep-base
-
-test_rebase 'G F E D B A' --fork-point refs/heads/master
-test_rebase 'G F E D B A' --fork-point master
-
-test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
-test_rebase 'G F D B A' --fork-point --onto D master
-
-test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
-test_rebase 'G F B A' --fork-point --keep-base master
-
-test_rebase 'G F C E D B A' refs/heads/master
-test_rebase 'G F C E D B A' master
-
-test_rebase 'G F C D B A' --onto D refs/heads/master
-test_rebase 'G F C D B A' --onto D master
-
-test_rebase 'G F C B A' --keep-base refs/heads/master
-test_rebase 'G F C B A' --keep-base master
-
-test_expect_success 'git rebase --fork-point with ambigous refname' '
-	git checkout master &&
-	git checkout -b one &&
-	git checkout side &&
-	git tag one &&
-	test_must_fail git rebase --fork-point --onto D one
-'
-
-test_done
-- 
cgit 1.4.1