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

diff --git a/third_party/git/t/t6407-merge-binary.sh b/third_party/git/t/t6407-merge-binary.sh
deleted file mode 100755
index 4e6c7cb77e7d..000000000000
--- a/third_party/git/t/t6407-merge-binary.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-test_description='ask merge-recursive to merge binary files'
-
-. ./test-lib.sh
-
-test_expect_success setup '
-
-	cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
-	git add m &&
-	git ls-files -s | sed -e "s/ 0	/ 1	/" >E1 &&
-	test_tick &&
-	git commit -m "initial" &&
-
-	git branch side &&
-	echo frotz >a &&
-	git add a &&
-	echo nitfol >>m &&
-	git add a m &&
-	git ls-files -s a >E0 &&
-	git ls-files -s m | sed -e "s/ 0	/ 3	/" >E3 &&
-	test_tick &&
-	git commit -m "master adds some" &&
-
-	git checkout side &&
-	echo rezrov >>m &&
-	git add m &&
-	git ls-files -s m | sed -e "s/ 0	/ 2	/" >E2 &&
-	test_tick &&
-	git commit -m "side modifies" &&
-
-	git tag anchor &&
-
-	cat E0 E1 E2 E3 >expect
-'
-
-test_expect_success resolve '
-
-	rm -f a* m* &&
-	git reset --hard anchor &&
-
-	if git merge -s resolve master
-	then
-		echo Oops, should not have succeeded
-		false
-	else
-		git ls-files -s >current
-		test_cmp expect current
-	fi
-'
-
-test_expect_success recursive '
-
-	rm -f a* m* &&
-	git reset --hard anchor &&
-
-	if git merge -s recursive master
-	then
-		echo Oops, should not have succeeded
-		false
-	else
-		git ls-files -s >current
-		test_cmp expect current
-	fi
-'
-
-test_done