Merge branch 'jm/instaweb-apache-24' into maint

diff --git a/git-svn.perl b/git-svn.perl
index 7349ffea5ad36f5677e7127fd693a72d155b1fa5..0a323722a601b2cb900385e531d315558b6d3fe9 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1389,17 +1389,7 @@ sub cmd_multi_init {
                usage(1);
        }
 
-       unless (defined $_prefix) {
-               $_prefix = '';
-               warn <<EOF
-WARNING: --prefix is not given, defaulting to empty prefix.
-         This is probably not what you want! In order to stay compatible
-         with regular remote-tracking refs, provide a prefix like
-         --prefix=origin/ (remember the trailing slash), which will cause
-         the SVN-tracking refs to be placed at refs/remotes/origin/*.
-NOTE: In Git v2.0, the default prefix will change from empty to 'origin/'.
-EOF
-       }
+       $_prefix = 'origin/' unless defined $_prefix;
        if (defined $url) {
                $url = canonicalize_url($url);
                init_subdir(@_);