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

diff --git a/third_party/git/t/t3422-rebase-incompatible-options.sh b/third_party/git/t/t3422-rebase-incompatible-options.sh
deleted file mode 100755
index c8234062c6c8..000000000000
--- a/third_party/git/t/t3422-rebase-incompatible-options.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-test_description='test if rebase detects and aborts on incompatible options'
-. ./test-lib.sh
-
-test_expect_success 'setup' '
-	test_seq 2 9 >foo &&
-	git add foo &&
-	git commit -m orig &&
-
-	git branch A &&
-	git branch B &&
-
-	git checkout A &&
-	test_seq 1 9 >foo &&
-	git add foo &&
-	git commit -m A &&
-
-	git checkout B &&
-	echo "q qfoo();" | q_to_tab >>foo &&
-	git add foo &&
-	git commit -m B
-'
-
-#
-# Rebase has lots of useful options like --whitepsace=fix, which are
-# actually all built in terms of flags to git-am.  Since neither
-# --merge nor --interactive (nor any options that imply those two) use
-# git-am, using them together will result in flags like --whitespace=fix
-# being ignored.  Make sure rebase warns the user and aborts instead.
-#
-
-test_rebase_am_only () {
-	opt=$1
-	shift
-	test_expect_success "$opt incompatible with --merge" "
-		git checkout B^0 &&
-		test_must_fail git rebase $opt --merge A
-	"
-
-	test_expect_success "$opt incompatible with --strategy=ours" "
-		git checkout B^0 &&
-		test_must_fail git rebase $opt --strategy=ours A
-	"
-
-	test_expect_success "$opt incompatible with --strategy-option=ours" "
-		git checkout B^0 &&
-		test_must_fail git rebase $opt --strategy-option=ours A
-	"
-
-	test_expect_success "$opt incompatible with --interactive" "
-		git checkout B^0 &&
-		test_must_fail git rebase $opt --interactive A
-	"
-
-	test_expect_success "$opt incompatible with --exec" "
-		git checkout B^0 &&
-		test_must_fail git rebase $opt --exec 'true' A
-	"
-
-}
-
-test_rebase_am_only --whitespace=fix
-test_rebase_am_only -C4
-
-test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
-	git checkout B^0 &&
-	test_must_fail git rebase --preserve-merges --signoff A
-'
-
-test_expect_success REBASE_P \
-	'--preserve-merges incompatible with --rebase-merges' '
-	git checkout B^0 &&
-	test_must_fail git rebase --preserve-merges --rebase-merges A
-'
-
-test_done