summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-08 11:16:56 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-08 11:16:56 -0800
commit59932be3446d757c813f17ea1701e9a731cde98b (patch)
tree67faedbd36bc1fd76d14ca3015aad0de87fc53e4 /t
parentee18de62b5ca1b94ac72799d38eb07cbb1e8d9f4 (diff)
parent8666df02dae889105b2d54aa08795aea1fbfa8c7 (diff)
downloadgit-59932be3446d757c813f17ea1701e9a731cde98b.tar.gz
Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maint
* jc/test-cvs-no-init-in-existing-dir: t9200: let "cvs init" create the test repository
Diffstat (limited to 't')
-rwxr-xr-xt/t9200-git-cvsexportcommit.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index 69934b2e77..3fb3368903 100755
--- a/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@ -25,8 +25,9 @@ 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 &&