[PATCH] svn: Quote repository root in regex match
- From
Ted Percival <ted.percival@quest.com>
- Date
- Oct 31, 2011, 22:37 UTC
- Message-ID
- <1320100632-10058-1-git-send-email-ted.percival@quest.com>
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> --- git-svn.perl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl index 351e743..4e95450 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -629,7 +629,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; @@ -791,7 +791,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 "
-- 1.7.7