Git::SVN: handle missing ref_id case correctly
authorRamkumar Ramachandra <artagnon@gmail.com>
Sat, 10 Jan 2015 14:35:10 +0000 (09:35 -0500)
committerEric Wong <normalperson@yhbt.net>
Thu, 15 Jan 2015 08:35:55 +0000 (08:35 +0000)
ref_id should not match "refs/remotes/".

[ew: dropped initial hunk for GIT_SVN_ID at Ramkumar's request]

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
perl/Git/SVN.pm
index d9a52a52df338926cdc21ea925cebc2dd7c3a388..8e4af7153eb8a8957bd4172e0c044c1bfc748ddb 100644 (file)
@@ -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;