X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-svn.perl;h=e30df22d89d97642f0b99c3a35ee0b2c5c062bb3;hb=50c94032844bb184cdeff7779be3b6a23e04d312;hp=b67fef0bf69da170a5a9748b9da8c31c6e1ca5c7;hpb=3b6a5d2d05d4945e11fbc3669a82f81ce18f80a4;p=git.git diff --git a/git-svn.perl b/git-svn.perl index b67fef0bf..e30df22d8 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -684,7 +684,7 @@ sub populate_merge_info { fatal "merge commit $d has ancestor $parent, but that change " ."does not have git-svn metadata!"; } - unless ($branchurl =~ /^$rooturl(.*)/) { + unless ($branchurl =~ /^\Q$rooturl\E(.*)/) { fatal "commit $parent git-svn metadata changed mid-run!"; } my $branchpath = $1; @@ -867,7 +867,7 @@ sub cmd_dcommit { ."has uuid $uuid!"; } - unless ($branchurl =~ /^$rooturl(.*)/) { + unless ($branchurl =~ /^\Q$rooturl\E(.*)/) { # This branch is very strange indeed. fatal "merge parent $parent for $d is on branch " ."$branchurl, which is not under the "