1 files changed, 164 insertions, 0 deletions
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
new file mode 100755
index 0000000000..251fdd66c4
--- /dev/null
+++ b/t/t9600-cvsimport.sh
@@ -0,0 +1,164 @@
+#!/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