Merge branch 'jk/subtree-prefix'

diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh
index ae26dbb2e9605e939ab4c478537d98949025363d..4f379c2ab499f2ca5556f844cbdcacb98fffa13c 100755 (executable)
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@ -5,7 +5,8 @@
 
 test_description='Test remote-bzr'
 
-. ./test-lib.sh
+test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=${0%/*}/../../t
+. "$TEST_DIRECTORY"/test-lib.sh
 
 if ! test_have_prereq PYTHON
 then
@@ -398,7 +399,7 @@ test_expect_success 'export utf-8 authors' '
        git add content &&
        git commit -m one &&
        git remote add bzr "bzr::../bzrrepo" &&
-       git push bzr
+       git push bzr master
        ) &&
 
        (