diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:38:09 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:38:09 -0800 |
commit | 3fce9a1eddedd5e67bff5b0310df68ab71017f13 (patch) | |
tree | 885b2542f53a45aa48a5467deb3a53eab3454968 | |
parent | Merge branch 'jc/maint-test-portability' (diff) | |
parent | t9200: let "cvs init" create the test repository (diff) | |
download | tgif-3fce9a1eddedd5e67bff5b0310df68ab71017f13.tar.xz |
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
-rwxr-xr-x | t/t9200-git-cvsexportcommit.sh | 3 |
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 && |