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

diff --git a/third_party/git/t/t3407-rebase-abort.sh b/third_party/git/t/t3407-rebase-abort.sh
deleted file mode 100755
index 97efea0f56..0000000000
--- a/third_party/git/t/t3407-rebase-abort.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/sh
-
-test_description='git rebase --abort tests'
-
-. ./test-lib.sh
-
-### Test that we handle space characters properly
-work_dir="$(pwd)/test dir"
-
-test_expect_success setup '
-	mkdir -p "$work_dir" &&
-	cd "$work_dir" &&
-	git init &&
-	echo a > a &&
-	git add a &&
-	git commit -m a &&
-	git branch to-rebase &&
-
-	echo b > a &&
-	git commit -a -m b &&
-	echo c > a &&
-	git commit -a -m c &&
-
-	git checkout to-rebase &&
-	echo d > a &&
-	git commit -a -m "merge should fail on this" &&
-	echo e > a &&
-	git commit -a -m "merge should fail on this, too" &&
-	git branch pre-rebase
-'
-
-testrebase() {
-	type=$1
-	dotest=$2
-
-	test_expect_success "rebase$type --abort" '
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_path_is_dir "$dotest" &&
-		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
-	'
-
-	test_expect_success "rebase$type --abort after --skip" '
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_path_is_dir "$dotest" &&
-		test_must_fail git rebase --skip &&
-		test $(git rev-parse HEAD) = $(git rev-parse master) &&
-		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
-	'
-
-	test_expect_success "rebase$type --abort after --continue" '
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_path_is_dir "$dotest" &&
-		echo c > a &&
-		echo d >> a &&
-		git add a &&
-		test_must_fail git rebase --continue &&
-		test $(git rev-parse HEAD) != $(git rev-parse master) &&
-		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
-	'
-
-	test_expect_success "rebase$type --abort does not update reflog" '
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		git reflog show to-rebase > reflog_before &&
-		test_must_fail git rebase$type master &&
-		git rebase --abort &&
-		git reflog show to-rebase > reflog_after &&
-		test_cmp reflog_before reflog_after &&
-		rm reflog_before reflog_after
-	'
-
-	test_expect_success 'rebase --abort can not be used with other options' '
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_must_fail git rebase -v --abort &&
-		test_must_fail git rebase --abort -v &&
-		git rebase --abort
-	'
-}
-
-testrebase " --apply" .git/rebase-apply
-testrebase " --merge" .git/rebase-merge
-
-test_expect_success 'rebase --apply --quit' '
-	cd "$work_dir" &&
-	# Clean up the state from the previous one
-	git reset --hard pre-rebase &&
-	test_must_fail git rebase --apply master &&
-	test_path_is_dir .git/rebase-apply &&
-	head_before=$(git rev-parse HEAD) &&
-	git rebase --quit &&
-	test $(git rev-parse HEAD) = $head_before &&
-	test ! -d .git/rebase-apply
-'
-
-test_expect_success 'rebase --merge --quit' '
-	cd "$work_dir" &&
-	# Clean up the state from the previous one
-	git reset --hard pre-rebase &&
-	test_must_fail git rebase --merge master &&
-	test_path_is_dir .git/rebase-merge &&
-	head_before=$(git rev-parse HEAD) &&
-	git rebase --quit &&
-	test $(git rev-parse HEAD) = $head_before &&
-	test ! -d .git/rebase-merge
-'
-
-test_done