Merge branch 'maint-1.6.6' into maint

diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh
old mode 100644 (file)
new mode 100755 (executable)
index 8000c34..5358142
--- a/t/t9150-svk-mergetickets.sh
+++ b/t/t9150-svk-mergetickets.sh
@@ -8,7 +8,8 @@ test_description='git-svn svk merge tickets'
 . ./lib-git-svn.sh
 
 test_expect_success 'load svk depot' "
-       svnadmin load -q '$rawsvnrepo' < '../t9150/svk-merge.dump' &&
+       svnadmin load -q '$rawsvnrepo' \
+         < '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
        git svn init --minimize-url -R svkmerge \
          -T trunk -b branches '$svnrepo' &&
        git svn fetch --all
@@ -17,7 +18,7 @@ test_expect_success 'load svk depot' "
 uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
 
 test_expect_success 'svk merges were represented coming in' "
-       [ `git-cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
+       [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
        "
 
 test_done