From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Tue, 21 Sep 2021 13:03:01 +0300
Subject: chore(3p/git): Unvendor git and track patches instead

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
---
 third_party/git/t/lib-cvs.sh | 78 --------------------------------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 third_party/git/t/lib-cvs.sh

(limited to 'third_party/git/t/lib-cvs.sh')

diff --git a/third_party/git/t/lib-cvs.sh b/third_party/git/t/lib-cvs.sh
deleted file mode 100644
index 9b2bcfb1b0e3..000000000000
--- a/third_party/git/t/lib-cvs.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-# Shell library sourced instead of ./test-lib.sh by cvsimport tests.
-
-. ./test-lib.sh
-
-unset CVS_SERVER
-
-if ! type cvs >/dev/null 2>&1
-then
-	skip_all='skipping cvsimport tests, cvs not found'
-	test_done
-fi
-
-CVS="cvs -f"
-export CVS
-
-cvsps_version=$(cvsps -h 2>&1 | sed -ne 's/cvsps version //p')
-case "$cvsps_version" in
-2.1 | 2.2*)
-	;;
-'')
-	skip_all='skipping cvsimport tests, cvsps not found'
-	test_done
-	;;
-*)
-	skip_all='skipping cvsimport tests, unsupported cvsps version'
-	test_done
-	;;
-esac
-
-setup_cvs_test_repository () {
-	CVSROOT="$(pwd)/.cvsroot" &&
-	cp -r "$TEST_DIRECTORY/$1/cvsroot" "$CVSROOT" &&
-	export CVSROOT
-}
-
-test_cvs_co () {
-	# Usage: test_cvs_co BRANCH_NAME
-	rm -rf module-cvs-"$1"
-	if [ "$1" = "master" ]
-	then
-		$CVS co -P -d module-cvs-"$1" -A module
-	else
-		$CVS co -P -d module-cvs-"$1" -r "$1" module
-	fi
-}
-
-test_git_co () {
-	# Usage: test_git_co BRANCH_NAME
-	(cd module-git && git checkout "$1")
-}
-
-test_cmp_branch_file () {
-	# Usage: test_cmp_branch_file BRANCH_NAME PATH
-	# The branch must already be checked out of CVS and git.
-	test_cmp module-cvs-"$1"/"$2" module-git/"$2"
-}
-
-test_cmp_branch_tree () {
-	# Usage: test_cmp_branch_tree BRANCH_NAME
-	# Check BRANCH_NAME out of CVS and git and make sure that all
-	# of the files and directories are identical.
-
-	test_cvs_co "$1" &&
-	test_git_co "$1" &&
-	(
-		cd module-cvs-"$1"
-		find . -type d -name CVS -prune -o -type f -print
-	) | sort >module-cvs-"$1".list &&
-	(
-		cd module-git
-		find . -type d -name .git -prune -o -type f -print
-	) | sort >module-git-"$1".list &&
-	test_cmp module-cvs-"$1".list module-git-"$1".list &&
-	cat module-cvs-"$1".list | while read f
-	do
-		test_cmp_branch_file "$1" "$f" || return 1
-	done
-}
-- 
cgit 1.4.1