summaryrefslogtreecommitdiff
path: root/t/t9151-svn-mergeinfo.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-10-30 20:10:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-30 22:03:10 (GMT)
commit15c6bf0df4d9f060b5cae7a9a899dc3601c54353 (patch)
treeee1ef3978e4c1e220defa7c09284f271a02b28f8 /t/t9151-svn-mergeinfo.sh
parentab3d175f87767c377cd65a06d96c50a316a28e30 (diff)
downloadgit-15c6bf0df4d9f060b5cae7a9a899dc3601c54353.zip
git-15c6bf0df4d9f060b5cae7a9a899dc3601c54353.tar.gz
git-15c6bf0df4d9f060b5cae7a9a899dc3601c54353.tar.bz2
t915{0,1}: use $TEST_DIRECTORY
Because --root can put our trash directories elsewhere, using ".." may not always work. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9151-svn-mergeinfo.sh')
-rwxr-xr-xt/t9151-svn-mergeinfo.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 7eb36e5..9bee516 100755
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -8,7 +8,8 @@ test_description='git-svn svn mergeinfo properties'
. ./lib-git-svn.sh
test_expect_success 'load svn dump' "
- svnadmin load -q '$rawsvnrepo' < '../t9151/svn-mergeinfo.dump' &&
+ svnadmin load -q '$rawsvnrepo' \
+ < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
git svn init --minimize-url -R svnmerge \
-T trunk -b branches '$svnrepo' &&
git svn fetch --all