mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: git-svn: Avoid spurious errors when rewriteRoot is used.
This commit is contained in:
commit
63d129d93e
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: ",
|
||||
|
|
Loading…
Reference in a new issue