X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/48eaeebe87521ef92000d03d3d3408913ae31c53..8bcdcdc99a819905d837ad90dd02aa3611c3144e:/t/test-lib.sh diff --git a/t/test-lib.sh b/t/test-lib.sh index 4bb00fb..3d114a2 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -226,12 +226,12 @@ test_create_repo () { repo="$1" mkdir "$repo" cd "$repo" || error "Cannot setup test environment" - git-init >/dev/null 2>&1 || - error "cannot run git-init -- have you installed git-core?" - mv .git/hooks .git/hooks-disabled + git init >/dev/null 2>&1 || + error "cannot run git init -- have you installed git-core?" + mkdir .git/info echo "empty start" | - git-commit-tree `git-write-tree` >.git/refs/heads/master 2>&4 || - error "cannot run git-commit -- is your git-core functioning?" + git commit-tree `git write-tree` >.git/refs/heads/master 2>&4 || + error "cannot run git commit -- is your git-core functioning?" cd "$owd" } @@ -261,8 +261,9 @@ test_done () { # t/ subdirectory and are run in trash subdirectory. PATH=$(pwd)/..:$PATH HOME=$(pwd)/trash +GIT_TEMPLATE_DIR=$(pwd)/../templates GIT_CONFIG=.git/config -export PATH HOME GIT_CONFIG +export PATH HOME GIT_TEMPLATE_DIR GIT_CONFIG # Test repository