unpack-trees: oneway_merge to update submodules

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 84366b262402c8eb38404e292b4a2fcd35e1ea5e..4c1f81f1678d83ab8b9ee7704d400bdd47ea70f7 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -110,14 +110,16 @@ EOF
 }
 
 require_svnserve () {
-       if test -z "$SVNSERVE_PORT"
+       test_tristate GIT_TEST_SVNSERVE
+       if ! test "$GIT_TEST_SVNSERVE" = true
        then
-               skip_all='skipping svnserve test. (set $SVNSERVE_PORT to enable)'
+               skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
                test_done
        fi
 }
 
 start_svnserve () {
+       SVNSERVE_PORT=${SVNSERVE_PORT-${this_test#t}}
        svnserve --listen-port $SVNSERVE_PORT \
                 --root "$rawsvnrepo" \
                 --listen-once \