chore(3p/git): Unvendor git and track patches instead r/2903

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

1 files changed, 0 insertions, 92 deletions

diff --git a/third_party/git/t/t6408-merge-up-to-date.sh b/third_party/git/t/t6408-merge-up-to-date.sh
deleted file mode 100755
index 7763c1ba9808..000000000000
--- a/third_party/git/t/t6408-merge-up-to-date.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-test_description='merge fast-forward and up to date'
-
-. ./test-lib.sh
-
-test_expect_success setup '
-	>file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	git tag c0 &&
-
-	echo second >file &&
-	git add file &&
-	test_tick &&
-	git commit -m second &&
-	git tag c1 &&
-	git branch test &&
-	echo third >file &&
-	git add file &&
-	test_tick &&
-	git commit -m third &&
-	git tag c2
-'
-
-test_expect_success 'merge -s recursive up-to-date' '
-
-	git reset --hard c1 &&
-	test_tick &&
-	git merge -s recursive c0 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
-
-'
-
-test_expect_success 'merge -s recursive fast-forward' '
-
-	git reset --hard c0 &&
-	test_tick &&
-	git merge -s recursive c1 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
-
-'
-
-test_expect_success 'merge -s ours up-to-date' '
-
-	git reset --hard c1 &&
-	test_tick &&
-	git merge -s ours c0 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
-
-'
-
-test_expect_success 'merge -s ours fast-forward' '
-
-	git reset --hard c0 &&
-	test_tick &&
-	git merge -s ours c1 &&
-	expect=$(git rev-parse c0^{tree}) &&
-	current=$(git rev-parse HEAD^{tree}) &&
-	test "$expect" = "$current"
-
-'
-
-test_expect_success 'merge -s subtree up-to-date' '
-
-	git reset --hard c1 &&
-	test_tick &&
-	git merge -s subtree c0 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
-
-'
-
-test_expect_success 'merge fast-forward octopus' '
-
-	git reset --hard c0 &&
-	test_tick &&
-	git merge c1 c2 &&
-	expect=$(git rev-parse c2) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
-'
-
-test_done