about summary refs log tree commit diff
path: root/third_party/git/t/t9600-cvsimport.sh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t9600-cvsimport.sh
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff)
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
Diffstat (limited to 'third_party/git/t/t9600-cvsimport.sh')
-rwxr-xr-xthird_party/git/t/t9600-cvsimport.sh164
1 files changed, 0 insertions, 164 deletions
diff --git a/third_party/git/t/t9600-cvsimport.sh b/third_party/git/t/t9600-cvsimport.sh
deleted file mode 100755
index 251fdd66c47b..000000000000
--- a/third_party/git/t/t9600-cvsimport.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh
-
-test_description='git cvsimport basic tests'
-. ./lib-cvs.sh
-
-if ! test_have_prereq NOT_ROOT; then
-	skip_all='When cvs is compiled with CVS_BADROOT commits as root fail'
-	test_done
-fi
-
-test_expect_success PERL 'setup cvsroot environment' '
-	CVSROOT=$(pwd)/cvsroot &&
-	export CVSROOT
-'
-
-test_expect_success PERL 'setup cvsroot' '$CVS init'
-
-test_expect_success PERL 'setup a cvs module' '
-
-	mkdir "$CVSROOT/module" &&
-	$CVS co -d module-cvs module &&
-	(cd module-cvs &&
-	cat <<EOF >o_fortuna &&
-O Fortuna
-velut luna
-statu variabilis,
-
-semper crescis
-aut decrescis;
-vita detestabilis
-
-nunc obdurat
-et tunc curat
-ludo mentis aciem,
-
-egestatem,
-potestatem
-dissolvit ut glaciem.
-EOF
-	$CVS add o_fortuna &&
-	cat <<EOF >message &&
-add "O Fortuna" lyrics
-
-These public domain lyrics make an excellent sample text.
-EOF
-	$CVS commit -F message
-	)
-'
-
-test_expect_success PERL 'import a trivial module' '
-
-	git cvsimport -a -R -z 0 -C module-git module &&
-	test_cmp module-cvs/o_fortuna module-git/o_fortuna
-
-'
-
-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
-
-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
-
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
-'
-
-test_expect_success PERL 'update cvs module' '
-	(cd module-cvs &&
-	cat <<EOF >o_fortuna &&
-O Fortune,
-like the moon
-you are changeable,
-
-ever waxing
-and waning;
-hateful life
-
-first oppresses
-and then soothes
-as fancy takes it;
-
-poverty
-and power
-it melts them like ice.
-EOF
-	cat <<EOF >message &&
-translate to English
-
-My Latin is terrible.
-EOF
-	$CVS commit -F message
-	)
-'
-
-test_expect_success PERL 'update git module' '
-
-	(cd module-git &&
-	git config cvsimport.trackRevisions true &&
-	git cvsimport -a -z 0 module &&
-	git merge origin
-	) &&
-	test_cmp module-cvs/o_fortuna module-git/o_fortuna
-
-'
-
-test_expect_success PERL 'update has correct .git/cvs-revisions' '
-
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
-	 git log --format="o_fortuna 1.2 %H" -1 HEAD) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
-'
-
-test_expect_success PERL 'update cvs module' '
-
-	(cd module-cvs &&
-		echo 1 >tick &&
-		$CVS add tick &&
-		$CVS commit -m 1
-	)
-'
-
-test_expect_success PERL 'cvsimport.module config works' '
-
-	(cd module-git &&
-		git config cvsimport.module module &&
-		git config cvsimport.trackRevisions true &&
-		git cvsimport -a -z0 &&
-		git merge origin
-	) &&
-	test_cmp module-cvs/tick module-git/tick
-
-'
-
-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
-
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
-	 git log --format="o_fortuna 1.2 %H" -1 HEAD^ &&
-	 git log --format="tick 1.1 %H" -1 HEAD) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
-'
-
-test_expect_success PERL 'import from a CVS working tree' '
-
-	$CVS co -d import-from-wt module &&
-	(cd import-from-wt &&
-		git config cvsimport.trackRevisions false &&
-		git cvsimport -a -z0 &&
-		echo 1 >expect &&
-		git log -1 --pretty=format:%s%n >actual &&
-		test_cmp expect actual
-	)
-
-'
-
-test_expect_success PERL 'no .git/cvs-revisions created by default' '
-
-	! test -e import-from-wt/.git/cvs-revisions
-
-'
-
-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
-
-test_done