From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 1 Feb 2007 12:06:27 +0000 (-0800)
Subject: git-svn: migrations default to [svn-remote "git-svn"]
X-Git-Tag: v1.5.1-rc1~195
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=471bc000528cf49928dae8872609b7fefc0c59ee;p=git.git

git-svn: migrations default to [svn-remote "git-svn"]

It looks better (like [remote "origin"]) instead of whatever
refname came up first in our directory traversal.  Of course
--remote= overrides this.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index ad2ef53f8..de14ed435 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2945,7 +2945,10 @@ sub migrate_from_v2 {
 	my $migrated = 0;
 
 	foreach my $ref_id (sort keys %l_map) {
-		Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id);
+		eval { Git::SVN->init($l_map{$ref_id}, '', undef, $ref_id) };
+		if ($@) {
+			Git::SVN->init($l_map{$ref_id}, '', $ref_id, $ref_id);
+		}
 		$migrated++;
 	}
 	$migrated;