microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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>
This commit is contained in:
Ted Percival 2011-10-31 16:37:12 -06:00 коммит произвёл Eric Wong
Родитель be3fa9125e
Коммит 0e7e30f560
1 изменённых файлов: 2 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
git-svn.perl
Просмотреть файл

@ -684,7 +684,7 @@ sub populate_merge_info {
fatal "merge commit $d has ancestor $parent, but that change " fatal "merge commit $d has ancestor $parent, but that change "
."does not have git-svn metadata!"; ."does not have git-svn metadata!";
} }
unless ($branchurl =~ /^$rooturl(.*)/) { unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
fatal "commit $parent git-svn metadata changed mid-run!"; fatal "commit $parent git-svn metadata changed mid-run!";
} }
my $branchpath = $1; my $branchpath = $1;
@ -867,7 +867,7 @@ sub cmd_dcommit {
."has uuid $uuid!"; ."has uuid $uuid!";
} }
unless ($branchurl =~ /^$rooturl(.*)/) { unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
# This branch is very strange indeed. # This branch is very strange indeed.
fatal "merge parent $parent for $d is on branch " fatal "merge parent $parent for $d is on branch "
."$branchurl, which is not under the " ."$branchurl, which is not under the "