зеркало из https://github.com/microsoft/git.git
git-svn: Avoid spurious errors when rewriteRoot is used.
After doing a rebase, git-svn checks that the SVN URL is what it expects. However, it does not account for rewriteRoot, which is a legitimate way for the URL to change. This produces a lot of spurious errors. [ew: fixed line wrapping] Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Родитель
8fd2cfa7ac
Коммит
c03c1f798d
11
git-svn.perl
11
git-svn.perl
|
@ -603,8 +603,15 @@ sub cmd_dcommit {
|
|||
"\nBefore dcommitting";
|
||||
}
|
||||
if ($url_ ne $expect_url) {
|
||||
fatal "URL mismatch after rebase: ",
|
||||
"$url_ != $expect_url";
|
||||
if ($url_ eq $gs->metadata_url) {
|
||||
print
|
||||
"Accepting rewritten URL:",
|
||||
" $url_\n";
|
||||
} else {
|
||||
fatal
|
||||
"URL mismatch after rebase:",
|
||||
" $url_ != $expect_url";
|
||||
}
|
||||
}
|
||||
if ($uuid_ ne $uuid) {
|
||||
fatal "uuid mismatch after rebase: ",
|
||||
|
|
Загрузка…
Ссылка в новой задаче