Andrew's git / gitweb.git / diff
?
Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 19:16:56 +0000 (11:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 19:16:56 +0000 (11:16 -0800)
* jc/test-cvs-no-init-in-existing-dir:
t9200: let "cvs init" create the test repository

1  2 
t/t9200-git-cvsexportcommit.sh patch | diff1 | diff2 | blob | history
diff --combined t/t9200-git-cvsexportcommit.sh
index 69934b2e775c8591ca209c9275abc40b921ecab6,c5368a38cd0773a1f61ec66d8ccdba25dfd6dc9f..3fb3368903686c8588c51e881beaee1f29808575
--- 1/t/t9200-git-cvsexportcommit.sh
--- 2/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@@ -19,14 -19,15 +19,15 @@@ the
      test_done
  fi
  
 -CVSROOT=$PWD/cvsroot
 +CVSROOT=$PWD/tmpcvsroot
  CVSWORK=$PWD/cvswork
  GIT_DIR=$PWD/.git
  export CVSROOT CVSWORK GIT_DIR
  
  rm -rf "$CVSROOT" "$CVSWORK"
- mkdir "$CVSROOT" &&
+ 
  cvs init &&
+ test -d "$CVSROOT" &&
  cvs -Q co -d "$CVSWORK" . &&
  echo >empty &&
  git add empty &&