Browse Source

svn: Quote repository root in regex match

Fixes a problem matching repository URLs, especially those with a '+' in
the URL, such as svn+ssh:// URLs. Parts of the URL were interpreted as
special characters by the regex matching.

Signed-off-by: Ted Percival <ted.percival@quest.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
maint
Ted Percival 13 years ago committed by Eric Wong
parent
commit
0e7e30f560
  1. 4
      git-svn.perl

4
git-svn.perl

@ -684,7 +684,7 @@ sub populate_merge_info { @@ -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 { @@ -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 "

Loading…
Cancel
Save