From 603ee0f0c3d1b8fc09929d185817c43e231317e7 Mon Sep 17 00:00:00 2001
From: "David A. Greene" <greened@obbligato.org>
Date: Tue, 20 Mar 2012 18:11:49 -0500
Subject: [PATCH] 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>
---
contrib/subtree/t/t7900-subtree.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 585f8d5751e..bc2eeb09448 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 "