From: David A. Greene <greened@obbligato.org>
Date: Tue, 20 Mar 2012 23:11:49 +0000 (-0500)
Subject: Set TEST_DIRECTORY
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=603ee0f0c3d1b8fc09929d185817c43e231317e7;p=git.git

Set TEST_DIRECTORY

Set TEST_DIRECTORY to the main git test area.  This allows the
git-subtree out-of-tree tests to run correctly.

Signed-off-by: David A. Greene <greened@obbligato.org>
---

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 585f8d575..bc2eeb094 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -8,7 +8,9 @@ This test verifies the basic operation of the merge, pull, add
 and split subcommands of git subtree.
 '
 
-. ./test-lib.sh
+export TEST_DIRECTORY=$(pwd)/../../../t
+
+. ../../../t/test-lib.sh
 
 create()
 {
@@ -30,7 +32,7 @@ check_equal()
 }
 
 fixnl()
-{	
+{
 	t=""
 	while read x; do
 		t="$t$x "