Merge branch 'jl/maint-fix-test'

* jl/maint-fix-test:
  Several tests: cd inside subshell instead of around

Conflicts:
	t/t9600-cvsimport.sh

diff --cc t/t3903-stash.sh
Simple merge

diff --cc t/t6050-replace.sh
Simple merge

diff --cc t/t9100-git-svn-basic.sh
Simple merge

diff --cc t/t9300-fast-import.sh
Simple merge

diff --cc t/t9600-cvsimport.sh
index 559ce417954e1ef8276efc860ca63eb0bdcce284,6ef1c340829bbf923902c6fcc61da698832874a2..432b82e3d5a361d0eba329f5d5c56c17009738db
--- 1/t/t9600-cvsimport.sh
--- 2/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@@ -38,29 -41,28 +38,28 @@@ add "O Fortuna" lyric
  
  These public domain lyrics make an excellent sample text.
  EOF
-       $CVS commit -F message &&
-       cd ..
+       $CVS commit -F message
+       )
  '
  
 -test_expect_success 'import a trivial module' '
 +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 && cd ..'
 -test_expect_success 'pack refs' '(cd module-git && git gc)'
++test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
  
 -test_expect_success 'initial import has correct .git/cvs-revisions' '
 +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 'update cvs module' '
 +test_expect_success PERL 'update cvs module' '
- 
-       cd module-cvs &&
+       (cd module-cvs &&
        cat <<EOF >o_fortuna &&
  O Fortune,
  like the moon
@@@ -83,16 -85,16 +82,16 @@@ translate to Englis
  
  My Latin is terrible.
  EOF
-       $CVS commit -F message &&
-       cd ..
+       $CVS commit -F message
+       )
  '
  
 -test_expect_success 'update git module' '
 +test_expect_success PERL 'update git module' '
  
-       cd module-git &&
+       (cd module-git &&
        git cvsimport -a -R -z 0 module &&
-       git merge origin &&
-       cd .. &&
+       git merge origin
+       ) &&
        test_cmp module-cvs/o_fortuna module-git/o_fortuna
  
  '
@@@ -105,23 -107,22 +104,22 @@@ test_expect_success PERL 'update has co
        test_cmp expected module-git/.git/cvs-revisions
  '
  
 -test_expect_success 'update cvs module' '
 +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 'cvsimport.module config works' '
 +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 merge origin
+       ) &&
        test_cmp module-cvs/tick module-git/tick
  
  '
@@@ -135,10 -136,10 +133,10 @@@ test_expect_success PERL 'second updat
        test_cmp expected module-git/.git/cvs-revisions
  '
  
 -test_expect_success 'import from a CVS working tree' '
 +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 cvsimport -a -z0 &&
                echo 1 >expect &&
                git log -1 --pretty=format:%s%n >actual &&

diff --cc t/t9603-cvsimport-patchsets.sh
Simple merge