# [PATCH] svn: Quote repository root in regex match 2 messages from 2011-10-31 to 2011-11-01. Participants: Ted Percival, Eric Wong. Thread: https://gitlist.dev/t/28812 ## Ted Percival, 2011-10-31 22:37 Subject: [PATCH] svn: Quote repository root in regex match Message-ID: <1320100632-10058-1-git-send-email-ted.percival@quest.com> URL: https://gitlist.dev/e/1320100632-10058-1-git-send-email-ted.percival%40quest.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 --- 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 ``` ## Eric Wong, 2011-11-01 20:13 Subject: Re: [PATCH] svn: Quote repository root in regex match Message-ID: <20111101201310.GA29769@dcvr.yhbt.net> URL: https://gitlist.dev/e/20111101201310.GA29769%40dcvr.yhbt.net In-Reply-To: <1320100632-10058-1-git-send-email-ted.percival@quest.com> ``` Ted Percival wrote: > 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 Looks obviously correct to me, thanks Acked-by: Eric Wong And pushed to master of git://bogomips.org/git-svn.git (commit 0e7e30f5606b48a4c6d34bc99c6d680bb76d3fbc) ```