[StGit PATCH 4/7] Set GIT_TEMPLATE_DIR in the testsuite, like it's done in git

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Pavel Roskin <proski@xxxxxxx>

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 <proski@xxxxxxx>
Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx>

---

 t/test-lib.sh |    5 +++--
 1 files 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

-
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

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux