[PATCH 8/8] test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:46:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Johannes Schindelin <redacted> --- t/test-lib.sh | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 495d55d..54bbb97 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh@@ -454,7 +454,7 @@ test_create_repo () { repo="$1" mkdir -p "$repo" cd "$repo" || error "Cannot setup test environment" - "$GIT_EXEC_PATH/git" init "--template=$GIT_EXEC_PATH/templates/blt/" >&3 2>&4 || + "$GIT_EXEC_PATH/git" init "--template=$owd/../templates/blt/" >&3 2>&4 || error "cannot run git init -- have you built things yet?" mv .git/hooks .git/hooks-disabled cd "$owd"
@@ -578,8 +578,6 @@ else PATH=$GIT_VALGRIND/bin:$PATH GIT_EXEC_PATH=$GIT_VALGRIND/bin export GIT_VALGRIND - - make_symlink ../../../templates "$GIT_VALGRIND"/bin/templates || exit fi GIT_TEMPLATE_DIR=$(pwd)/../templates/blt unset GIT_CONFIG
--
1.6.1.2.582.g3fdd5