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, 108 deletions

diff --git a/third_party/git/t/t6417-merge-ours-theirs.sh b/third_party/git/t/t6417-merge-ours-theirs.sh
deleted file mode 100755
index 0aebc6c028e0..000000000000
--- a/third_party/git/t/t6417-merge-ours-theirs.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-test_description='Merge-recursive ours and theirs variants'
-. ./test-lib.sh
-
-test_expect_success setup '
-	for i in 1 2 3 4 5 6 7 8 9
-	do
-		echo "$i"
-	done >file &&
-	git add file &&
-	cp file elif &&
-	git commit -m initial &&
-
-	sed -e "s/1/one/" -e "s/9/nine/" >file <elif &&
-	git commit -a -m ours &&
-
-	git checkout -b side HEAD^ &&
-
-	sed -e "s/9/nueve/" >file <elif &&
-	git commit -a -m theirs &&
-
-	git checkout master^0
-'
-
-test_expect_success 'plain recursive - should conflict' '
-	git reset --hard master &&
-	test_must_fail git merge -s recursive side &&
-	grep nine file &&
-	grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-'
-
-test_expect_success 'recursive favouring theirs' '
-	git reset --hard master &&
-	git merge -s recursive -Xtheirs side &&
-	! grep nine file &&
-	grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-'
-
-test_expect_success 'recursive favouring ours' '
-	git reset --hard master &&
-	git merge -s recursive -X ours side &&
-	grep nine file &&
-	! grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-'
-
-test_expect_success 'binary file with -Xours/-Xtheirs' '
-	echo file binary >.gitattributes &&
-
-	git reset --hard master &&
-	git merge -s recursive -X theirs side &&
-	git diff --exit-code side HEAD -- file &&
-
-	git reset --hard master &&
-	git merge -s recursive -X ours side &&
-	git diff --exit-code master HEAD -- file
-'
-
-test_expect_success 'pull passes -X to underlying merge' '
-	git reset --hard master && git pull -s recursive -Xours . side &&
-	git reset --hard master && git pull -s recursive -X ours . side &&
-	git reset --hard master && git pull -s recursive -Xtheirs . side &&
-	git reset --hard master && git pull -s recursive -X theirs . side &&
-	git reset --hard master && test_must_fail git pull -s recursive -X bork . side
-'
-
-test_expect_success SYMLINKS 'symlink with -Xours/-Xtheirs' '
-	git reset --hard master &&
-	git checkout -b two master &&
-	ln -s target-zero link &&
-	git add link &&
-	git commit -m "add link pointing to zero" &&
-
-	ln -f -s target-two link &&
-	git commit -m "add link pointing to two" link &&
-
-	git checkout -b one HEAD^ &&
-	ln -f -s target-one link &&
-	git commit -m "add link pointing to one" link &&
-
-	# we expect symbolic links not to resolve automatically, of course
-	git checkout one^0 &&
-	test_must_fail git merge -s recursive two &&
-
-	# favor theirs to resolve to target-two?
-	git reset --hard &&
-	git checkout one^0 &&
-	git merge -s recursive -X theirs two &&
-	git diff --exit-code two HEAD link &&
-
-	# favor ours to resolve to target-one?
-	git reset --hard &&
-	git checkout one^0 &&
-	git merge -s recursive -X ours two &&
-	git diff --exit-code one HEAD link
-
-'
-
-test_done