From 1275d9921fb6d07cc68591786a1e825a388dbe38 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 9 Sep 2007 22:48:15 -0400 Subject: [PATCH] Set GIT_TEMPLATE_DIR in the testsuite, like it's done in git MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Otherwise, the git configuration affects the testsuite. Since we don't have git templates in the source tree, use our "template" directory. No templates are really needed, it's just a directory with known contents. Remove the command that moves .git/hooks away, as it's not created anymore. Create empty .git/info/, as some tests assume it to exist. Signed-off-by: Pavel Roskin Signed-off-by: Karl Hasselström --- t/test-lib.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 4bb00fb..2d12f1b 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -228,7 +228,7 @@ test_create_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 + 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?" @@ -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 -- 2.11.0