Merge branch 'jk/hashcmp-memcmp' into next

diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
index 71178e2e5fa91920dd9662688b061e3c28a81141..827d39f5bf28652cc3d9fdf2f331592ed0b46ecc 100755 (executable)
--- a/t/t9601-cvsimport-vendor-branch.sh
+++ b/t/t9601-cvsimport-vendor-branch.sh
@@ -34,10 +34,7 @@
 test_description='git cvsimport handling of vendor branches'
 . ./lib-cvs.sh
 
-test_expect_success PERL 'setup CVSROOT' '
-       CVSROOT="$TEST_DIRECTORY"/t9601/cvsroot &&
-       export CVSROOT
-'
+setup_cvs_test_repository t9601
 
 test_expect_success PERL 'import a module with a vendor branch' '