Merge branch 'ks/rebase-i-abbrev' into maint

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index d9a52a52df338926cdc21ea925cebc2dd7c3a388..8e4af7153eb8a8957bd4172e0c044c1bfc748ddb 100644 (file)
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -2365,7 +2365,7 @@ sub _new {
 
        # Older repos imported by us used $GIT_DIR/svn/foo instead of
        # $GIT_DIR/svn/refs/remotes/foo when tracking refs/remotes/foo
-       if ($ref_id =~ m{^refs/remotes/(.*)}) {
+       if ($ref_id =~ m{^refs/remotes/(.+)}) {
                my $old_dir = "$ENV{GIT_DIR}/svn/$1";
                if (-d $old_dir && ! -d $dir) {
                        $dir = $old_dir;