[PATCH v2 8/6] t9600: adjust for new cvsimport
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:45
Subsystem:
the rest · Maintainer:
Linus Torvalds
The rewritten cvsimport does not skip the latest 10 minutes worth of
CVS commits by default, so there is no need to pass the "-a" option;
it will barf if it sees "-a".
Also it will do the merge itself, so there is no need to merge
"origin" ourselves, either.
Signed-off-by: Junio C Hamano <redacted>
---
* This is still untested and primarily to illustrate the concept
introduced by the 5/6 patch, together with 6/6. Testing by
interested parties with a working cvsps 3 may be nice. Something
like:
$ make CVSPS3_PATH=/path/to/your/cvsps3/bin/cvsps
$ cd t && sh t9650-cvsimport3.sh
t/t9600-cvsimport.sh | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 906cbdc..7b5a9a0 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh@@ -42,9 +42,13 @@ EOF ) ' -test_expect_success 'import a trivial module' ' +case "$TEST_CVSPS_VERSION" in +3) import_all= ;; +*) import_all=-a ;; +esac && - git cvsimport -a -R -z 0 -C module-git module && +test_expect_success 'import a trivial module' ' + git cvsimport $import_all -R -z 0 -C module-git module && test_cmp module-cvs/o_fortuna module-git/o_fortuna '
@@ -90,8 +94,11 @@ test_expect_success 'update git module' ' (cd module-git && git config cvsimport.trackRevisions true && - git cvsimport -a -z 0 module && - git merge origin + git cvsimport $import_all -z 0 module && + if test "$TEST_CVSPS_VERSION" = 2 + then + git merge origin + fi ) && test_cmp module-cvs/o_fortuna module-git/o_fortuna
@@ -119,8 +126,11 @@ test_expect_success 'cvsimport.module config works' ' (cd module-git && git config cvsimport.module module && git config cvsimport.trackRevisions true && - git cvsimport -a -z0 && - git merge origin + git cvsimport $import_all -z0 && + if test "$TEST_CVSPS_VERSION" = 2 + then + git merge origin + fi ) && test_cmp module-cvs/tick module-git/tick
@@ -140,7 +150,7 @@ test_expect_success '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 && + git cvsimport $import_all -z0 && echo 1 >expect && git log -1 --pretty=format:%s%n >actual && test_cmp actual expect
--
1.8.1.421.g6236851