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/t4066-diff-emit-delay.sh | 79 ------------------------------
 1 file changed, 79 deletions(-)
 delete mode 100755 third_party/git/t/t4066-diff-emit-delay.sh

(limited to 'third_party/git/t/t4066-diff-emit-delay.sh')

diff --git a/third_party/git/t/t4066-diff-emit-delay.sh b/third_party/git/t/t4066-diff-emit-delay.sh
deleted file mode 100755
index 6331f63b127c..000000000000
--- a/third_party/git/t/t4066-diff-emit-delay.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-test_description='test combined/stat/moved interaction'
-. ./test-lib.sh
-
-# This test covers a weird 3-way interaction between "--cc -p", which will run
-# the combined diff code, along with "--stat", which will be computed as a
-# first-parent stat during the combined diff, and "--color-moved", which
-# enables the emitted_symbols list to store the diff in memory.
-
-test_expect_success 'set up history with a merge' '
-	test_commit A &&
-	test_commit B &&
-	git checkout -b side HEAD^ &&
-	test_commit C &&
-	git merge -m M master &&
-	test_commit D
-'
-
-test_expect_success 'log --cc -p --stat --color-moved' '
-	cat >expect <<-EOF &&
-	commit D
-	---
-	 D.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/D.t b/D.t
-	new file mode 100644
-	index 0000000..$(git rev-parse --short D:D.t)
-	--- /dev/null
-	+++ b/D.t
-	@@ -0,0 +1 @@
-	+D
-	commit M
-
-	 B.t | 1 +
-	 1 file changed, 1 insertion(+)
-	commit C
-	---
-	 C.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/C.t b/C.t
-	new file mode 100644
-	index 0000000..$(git rev-parse --short C:C.t)
-	--- /dev/null
-	+++ b/C.t
-	@@ -0,0 +1 @@
-	+C
-	commit B
-	---
-	 B.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/B.t b/B.t
-	new file mode 100644
-	index 0000000..$(git rev-parse --short B:B.t)
-	--- /dev/null
-	+++ b/B.t
-	@@ -0,0 +1 @@
-	+B
-	commit A
-	---
-	 A.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/A.t b/A.t
-	new file mode 100644
-	index 0000000..$(git rev-parse --short A:A.t)
-	--- /dev/null
-	+++ b/A.t
-	@@ -0,0 +1 @@
-	+A
-	EOF
-	git log --format="commit %s" --cc -p --stat --color-moved >actual &&
-	test_cmp expect actual
-'
-
-test_done
-- 
cgit 1.4.1