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

diff --git a/third_party/git/t/t0090-cache-tree.sh b/third_party/git/t/t0090-cache-tree.sh
deleted file mode 100755
index 5a633690bffc..000000000000
--- a/third_party/git/t/t0090-cache-tree.sh
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/bin/sh
-
-test_description="Test whether cache-tree is properly updated
-
-Tests whether various commands properly update and/or rewrite the
-cache-tree extension.
-"
- . ./test-lib.sh
-
-cmp_cache_tree () {
-	test-tool dump-cache-tree | sed -e '/#(ref)/d' >actual &&
-	sed "s/$OID_REGEX/SHA/" <actual >filtered &&
-	test_cmp "$1" filtered
-}
-
-# We don't bother with actually checking the SHA1:
-# test-tool dump-cache-tree already verifies that all existing data is
-# correct.
-generate_expected_cache_tree_rec () {
-	dir="$1${1:+/}" &&
-	parent="$2" &&
-	# ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
-	# We want to count only foo because it's the only direct child
-	git ls-files >files &&
-	subtrees=$(grep / files|cut -d / -f 1|uniq) &&
-	subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 != "" {++c} END {print c}') &&
-	entries=$(wc -l <files) &&
-	printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
-	for subtree in $subtrees
-	do
-		cd "$subtree"
-		generate_expected_cache_tree_rec "$dir$subtree" "$dir" || return 1
-		cd ..
-	done &&
-	dir=$parent
-}
-
-generate_expected_cache_tree () {
-	(
-		generate_expected_cache_tree_rec
-	)
-}
-
-test_cache_tree () {
-	generate_expected_cache_tree >expect &&
-	cmp_cache_tree expect
-}
-
-test_invalid_cache_tree () {
-	printf "invalid                                  %s ()\n" "" "$@" >expect &&
-	test-tool dump-cache-tree |
-	sed -n -e "s/[0-9]* subtrees//" -e '/#(ref)/d' -e '/^invalid /p' >actual &&
-	test_cmp expect actual
-}
-
-test_no_cache_tree () {
-	: >expect &&
-	cmp_cache_tree expect
-}
-
-test_expect_success 'initial commit has cache-tree' '
-	test_commit foo &&
-	test_cache_tree
-'
-
-test_expect_success 'read-tree HEAD establishes cache-tree' '
-	git read-tree HEAD &&
-	test_cache_tree
-'
-
-test_expect_success 'git-add invalidates cache-tree' '
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	echo "I changed this file" >foo &&
-	git add foo &&
-	test_invalid_cache_tree
-'
-
-test_expect_success 'git-add in subdir invalidates cache-tree' '
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	mkdir dirx &&
-	echo "I changed this file" >dirx/foo &&
-	git add dirx/foo &&
-	test_invalid_cache_tree
-'
-
-cat >before <<\EOF
-SHA  (3 entries, 2 subtrees)
-SHA dir1/ (1 entries, 0 subtrees)
-SHA dir2/ (1 entries, 0 subtrees)
-EOF
-
-cat >expect <<\EOF
-invalid                                   (2 subtrees)
-invalid                                  dir1/ (0 subtrees)
-SHA dir2/ (1 entries, 0 subtrees)
-EOF
-
-test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
-	git tag no-children &&
-	test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
-	mkdir dir1 dir2 &&
-	test_commit dir1/a &&
-	test_commit dir2/b &&
-	echo "I changed this file" >dir1/a &&
-	cmp_cache_tree before &&
-	echo "I changed this file" >dir1/a &&
-	git add dir1/a &&
-	cmp_cache_tree expect
-'
-
-test_expect_success 'update-index invalidates cache-tree' '
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	echo "I changed this file" >foo &&
-	git update-index --add foo &&
-	test_invalid_cache_tree
-'
-
-test_expect_success 'write-tree establishes cache-tree' '
-	test-tool scrap-cache-tree &&
-	git write-tree &&
-	test_cache_tree
-'
-
-test_expect_success 'test-tool scrap-cache-tree works' '
-	git read-tree HEAD &&
-	test-tool scrap-cache-tree &&
-	test_no_cache_tree
-'
-
-test_expect_success 'second commit has cache-tree' '
-	test_commit bar &&
-	test_cache_tree
-'
-
-test_expect_success PERL 'commit --interactive gives cache-tree on partial commit' '
-	cat <<-\EOT >foo.c &&
-	int foo()
-	{
-		return 42;
-	}
-	int bar()
-	{
-		return 42;
-	}
-	EOT
-	git add foo.c &&
-	test_invalid_cache_tree &&
-	git commit -m "add a file" &&
-	test_cache_tree &&
-	cat <<-\EOT >foo.c &&
-	int foo()
-	{
-		return 43;
-	}
-	int bar()
-	{
-		return 44;
-	}
-	EOT
-	test_write_lines p 1 "" s n y q |
-	git commit --interactive -m foo &&
-	test_cache_tree
-'
-
-test_expect_success PERL 'commit -p with shrinking cache-tree' '
-	mkdir -p deep/very-long-subdir &&
-	echo content >deep/very-long-subdir/file &&
-	git add deep &&
-	git commit -m add &&
-	git rm -r deep &&
-
-	before=$(wc -c <.git/index) &&
-	git commit -m delete -p &&
-	after=$(wc -c <.git/index) &&
-
-	# double check that the index shrank
-	test $before -gt $after &&
-
-	# and that our index was not corrupted
-	git fsck
-'
-
-test_expect_success 'commit in child dir has cache-tree' '
-	mkdir dir &&
-	>dir/child.t &&
-	git add dir/child.t &&
-	git commit -m dir/child.t &&
-	test_cache_tree
-'
-
-test_expect_success 'reset --hard gives cache-tree' '
-	test-tool scrap-cache-tree &&
-	git reset --hard &&
-	test_cache_tree
-'
-
-test_expect_success 'reset --hard without index gives cache-tree' '
-	rm -f .git/index &&
-	git reset --hard &&
-	test_cache_tree
-'
-
-test_expect_success 'checkout gives cache-tree' '
-	git tag current &&
-	git checkout HEAD^ &&
-	test_cache_tree
-'
-
-test_expect_success 'checkout -b gives cache-tree' '
-	git checkout current &&
-	git checkout -b prev HEAD^ &&
-	test_cache_tree
-'
-
-test_expect_success 'checkout -B gives cache-tree' '
-	git checkout current &&
-	git checkout -B prev HEAD^ &&
-	test_cache_tree
-'
-
-test_expect_success 'merge --ff-only maintains cache-tree' '
-	git checkout current &&
-	git checkout -b changes &&
-	test_commit llamas &&
-	test_commit pachyderm &&
-	test_cache_tree &&
-	git checkout current &&
-	test_cache_tree &&
-	git merge --ff-only changes &&
-	test_cache_tree
-'
-
-test_expect_success 'merge maintains cache-tree' '
-	git checkout current &&
-	git checkout -b changes2 &&
-	test_commit alpacas &&
-	test_cache_tree &&
-	git checkout current &&
-	test_commit struthio &&
-	test_cache_tree &&
-	git merge changes2 &&
-	test_cache_tree
-'
-
-test_expect_success 'partial commit gives cache-tree' '
-	git checkout -b partial no-children &&
-	test_commit one &&
-	test_commit two &&
-	echo "some change" >one.t &&
-	git add one.t &&
-	echo "some other change" >two.t &&
-	git commit two.t -m partial &&
-	test_cache_tree
-'
-
-test_expect_success 'no phantom error when switching trees' '
-	mkdir newdir &&
-	>newdir/one &&
-	git add newdir/one &&
-	git checkout 2>errors &&
-	test_must_be_empty errors
-'
-
-test_expect_success 'switching trees does not invalidate shared index' '
-	(
-		sane_unset GIT_TEST_SPLIT_INDEX &&
-		git update-index --split-index &&
-		>split &&
-		git add split &&
-		test-tool dump-split-index .git/index | grep -v ^own >before &&
-		git commit -m "as-is" &&
-		test-tool dump-split-index .git/index | grep -v ^own >after &&
-		test_cmp before after
-	)
-'
-
-test_done