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

diff --git a/third_party/git/t/t3509-cherry-pick-merge-df.sh b/third_party/git/t/t3509-cherry-pick-merge-df.sh
deleted file mode 100755
index 1e5b3948dfc5..000000000000
--- a/third_party/git/t/t3509-cherry-pick-merge-df.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-test_description='Test cherry-pick with directory/file conflicts'
-. ./test-lib.sh
-
-test_expect_success 'Initialize repository' '
-	mkdir a &&
-	>a/f &&
-	git add a &&
-	git commit -m a
-'
-
-test_expect_success 'Setup rename across paths each below D/F conflicts' '
-	mkdir b &&
-	test_ln_s_add ../a b/a &&
-	git commit -m b &&
-
-	git checkout -b branch &&
-	rm b/a &&
-	git mv a b/a &&
-	test_ln_s_add b/a a &&
-	git commit -m swap &&
-
-	>f1 &&
-	git add f1 &&
-	git commit -m f1
-'
-
-test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' '
-	git reset --hard &&
-	git checkout master^0 &&
-	git cherry-pick branch
-'
-
-test_expect_success 'Setup rename with file on one side matching directory name on other' '
-	git checkout --orphan nick-testcase &&
-	git rm -rf . &&
-
-	>empty &&
-	git add empty &&
-	git commit -m "Empty file" &&
-
-	git checkout -b simple &&
-	mv empty file &&
-	mkdir empty &&
-	mv file empty &&
-	git add empty/file &&
-	git commit -m "Empty file under empty dir" &&
-
-	echo content >newfile &&
-	git add newfile &&
-	git commit -m "New file"
-'
-
-test_expect_success 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)' '
-	git reset --hard &&
-	git checkout -q nick-testcase^0 &&
-	git cherry-pick --strategy=resolve simple
-'
-
-test_expect_success 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)' '
-	git reset --hard &&
-	git checkout -q nick-testcase^0 &&
-	git cherry-pick --strategy=recursive simple
-'
-
-test_expect_success 'Setup rename with file on one side matching different dirname on other' '
-	git reset --hard &&
-	git checkout --orphan mergeme &&
-	git rm -rf . &&
-
-	mkdir sub &&
-	mkdir othersub &&
-	echo content > sub/file &&
-	echo foo > othersub/whatever &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git rm -rf othersub &&
-	git mv sub/file othersub &&
-	git commit -m "Commit to merge" &&
-
-	git checkout -b newhead mergeme~1 &&
-	>independent-change &&
-	git add independent-change &&
-	git commit -m "Completely unrelated change"
-'
-
-test_expect_success 'Cherry-pick with rename to different D/F conflict succeeds (resolve)' '
-	git reset --hard &&
-	git checkout -q newhead^0 &&
-	git cherry-pick --strategy=resolve mergeme
-'
-
-test_expect_success 'Cherry-pick with rename to different D/F conflict succeeds (recursive)' '
-	git reset --hard &&
-	git checkout -q newhead^0 &&
-	git cherry-pick --strategy=recursive mergeme
-'
-
-test_done