From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Jan 2013 18:38:09 +0000 (-0800)
Subject: Merge branch 'jc/test-cvs-no-init-in-existing-dir'
X-Git-Tag: v1.8.2-rc0~213
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3fce9a1eddedd5e67bff5b0310df68ab71017f13?ds=inline;hp=-c

Merge branch 'jc/test-cvs-no-init-in-existing-dir'

t9200 runs "cvs init" on a directory that already exists, but a
platform can configure this fail for the current user (e.g. you need
to be in the cvsadmin group on NetBSD 6.0).

* jc/test-cvs-no-init-in-existing-dir:
t9200: let "cvs init" create the test repository
---

3fce9a1eddedd5e67bff5b0310df68ab71017f13
diff --combined t/t9200-git-cvsexportcommit.sh
index 69934b2e77,c5368a38cd..3fb3368903
--- a/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 &&