Merge branch 'rr/rebase-autostash-fix'

diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
index 75d74298ea5e39ed846254ac4d95f88d0be6ed7b..cf6ffa7581310986b7618da36346dc499a9fb098 100644 (file)
--- a/perl/Git/SVN/Migration.pm
+++ b/perl/Git/SVN/Migration.pm
@@ -1,6 +1,6 @@
 package Git::SVN::Migration;
 # these version numbers do NOT correspond to actual version numbers
-# of git nor git-svn.  They are just relative.
+# of git or git-svn.  They are just relative.
 #
 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
 #
@@ -177,14 +177,14 @@ sub minimize_connections {
                my $ra = Git::SVN::Ra->new($url);
 
                # skip existing cases where we already connect to the root
-               if (($ra->{url} eq $ra->{repos_root}) ||
+               if (($ra->url eq $ra->{repos_root}) ||
                    ($ra->{repos_root} eq $repo_id)) {
-                       $root_repos->{$ra->{url}} = $repo_id;
+                       $root_repos->{$ra->url} = $repo_id;
                        next;
                }
 
                my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
-               my $root_path = $ra->{url};
+               my $root_path = $ra->url;
                $root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##;
                foreach my $path (keys %$fetch) {
                        my $ref_id = $fetch->{$path};