Merge branch 'tq/git-ssh-command'

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 559ce417954e1ef8276efc860ca63eb0bdcce284..4c384ff02333e1413cc67b1b4a6bed47ae3d00db 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -14,7 +14,7 @@ test_expect_success PERL 'setup a cvs module' '
 
        mkdir "$CVSROOT/module" &&
        $CVS co -d module-cvs module &&
-       cd module-cvs &&
+       (cd module-cvs &&
        cat <<EOF >o_fortuna &&
 O Fortuna
 velut luna
@@ -38,8 +38,8 @@ add "O Fortuna" lyrics
 
 These public domain lyrics make an excellent sample text.
 EOF
-       $CVS commit -F message &&
-       cd ..
+       $CVS commit -F message
+       )
 '
 
 test_expect_success PERL 'import a trivial module' '
@@ -49,7 +49,7 @@ test_expect_success PERL 'import a trivial module' '
 
 '
 
-test_expect_success PERL 'pack refs' 'cd module-git && git gc && cd ..'
+test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
 
 test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
 
@@ -59,8 +59,7 @@ test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
 '
 
 test_expect_success PERL 'update cvs module' '
-
-       cd module-cvs &&
+       (cd module-cvs &&
        cat <<EOF >o_fortuna &&
 O Fortune,
 like the moon
@@ -83,16 +82,17 @@ translate to English
 
 My Latin is terrible.
 EOF
-       $CVS commit -F message &&
-       cd ..
+       $CVS commit -F message
+       )
 '
 
 test_expect_success PERL 'update git module' '
 
-       cd module-git &&
-       git cvsimport -a -R -z 0 module &&
-       git merge origin &&
-       cd .. &&
+       (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
 
 '
@@ -107,21 +107,21 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
 
 test_expect_success PERL 'update cvs module' '
 
-       cd module-cvs &&
+       (cd module-cvs &&
                echo 1 >tick &&
                $CVS add tick &&
                $CVS commit -m 1
-       cd ..
-
+       )
 '
 
 test_expect_success PERL 'cvsimport.module config works' '
 
-       cd module-git &&
+       (cd module-git &&
                git config cvsimport.module module &&
-               git cvsimport -a -R -z0 &&
-               git merge origin &&
-       cd .. &&
+               git config cvsimport.trackRevisions true &&
+               git cvsimport -a -z0 &&
+               git merge origin
+       ) &&
        test_cmp module-cvs/tick module-git/tick
 
 '
@@ -138,12 +138,13 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
 test_expect_success PERL 'import from a CVS working tree' '
 
        $CVS co -d import-from-wt module &&
-       cd import-from-wt &&
+       (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 actual expect &&
-       cd ..
+               test_cmp actual expect
+       )
 
 '