Otherwise, the git configuration affects the testsuite. Since we don't have any git templates in the source tree, use stgit templates. Neither are really needed for the tests. Comment out the command that moves .git/hooks away, as it's not created anymore. Create empty .git/info/exclude, it's needed. Signed-off-by: Pavel Roskin <proski@xxxxxxx> --- t/test-lib.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 4bb00fb..68d6200 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -228,7 +228,8 @@ 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 + touch .git/info/exclude 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 +262,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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html