mergetool: don't require a work tree for --tool-help

diff --git a/git-svn.perl b/git-svn.perl
index ff1ce3d351c8e4e175321d45b7284070f9ce691a..0a323722a601b2cb900385e531d315558b6d3fe9 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1389,7 +1389,7 @@ sub cmd_multi_init {
                usage(1);
        }
 
-       $_prefix = '' unless defined $_prefix;
+       $_prefix = 'origin/' unless defined $_prefix;
        if (defined $url) {
                $url = canonicalize_url($url);
                init_subdir(@_);
@@ -1759,7 +1759,7 @@ sub get_commit_entry {
                my $msgbuf = "";
                while (<$msg_fh>) {
                        if (!$in_msg) {
-                               $in_msg = 1 if (/^\s*$/);
+                               $in_msg = 1 if (/^$/);
                                $author = $1 if (/^author (.*>)/);
                        } elsif (/^git-svn-id: /) {
                                # skip this for now, we regenerate the