summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2015-01-10 09:35:10 -0500
committerEric Wong <normalperson@yhbt.net>2015-01-15 08:35:55 +0000
commit9a2bb059e76b1368392f86ecf7af2ba188e3cac5 (patch)
tree152ee39bd2be4297f27b4642aa0a1788c6d23dba
parent563d4e59bd167fe2eecc5480e3841d878b1c8c2b (diff)
downloadgit-9a2bb059e76b1368392f86ecf7af2ba188e3cac5.tar.gz
Git::SVN: handle missing ref_id case correctly
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>
-rw-r--r--perl/Git/SVN.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index d9a52a52df..8e4af7153e 100644
--- 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;