Merge branch 'jc/rebase-orig-head'

diff --git a/t/t9113-git-svn-dcommit-new-file.sh b/t/t9113-git-svn-dcommit-new-file.sh
index 31c929b57368fe08f35301a75bff48e19b86a06d..8da8ce58eb1b29210a6ac95fdd3a3fcb547ca36f 100755 (executable)
--- a/t/t9113-git-svn-dcommit-new-file.sh
+++ b/t/t9113-git-svn-dcommit-new-file.sh
@@ -7,12 +7,18 @@
 # I don't like the idea of taking a port and possibly leaving a
 # daemon running on a users system if the test fails.
 # Not all git users will need to interact with SVN.
-test -z "$SVNSERVE_PORT" && exit 0
 
 test_description='git-svn dcommit new files over svn:// test'
 
 . ./lib-git-svn.sh
 
+if test -z "$SVNSERVE_PORT"
+then
+       say 'skipping svnserve test. (set $SVNSERVE_PORT to enable)'
+       test_done
+       exit
+fi
+
 start_svnserve () {
        svnserve --listen-port $SVNSERVE_PORT \
                 --root "$rawsvnrepo" \