summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorDavid A. Greene <greened@obbligato.org>2012-03-20 23:11:49 (GMT)
committerDavid A. Greene <greened@obbligato.org>2012-04-10 01:23:10 (GMT)
commit603ee0f0c3d1b8fc09929d185817c43e231317e7 (patch)
treef74ada36ac7846652dc204d1b30f90c482772a57 /contrib/subtree
parent634392b26275fe5436c0ea131bc89b46476aa4ae (diff)
downloadgit-603ee0f0c3d1b8fc09929d185817c43e231317e7.zip
git-603ee0f0c3d1b8fc09929d185817c43e231317e7.tar.gz
git-603ee0f0c3d1b8fc09929d185817c43e231317e7.tar.bz2
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>
Diffstat (limited to 'contrib/subtree')
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 585f8d5..bc2eeb0 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 "