development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.bogomips.org/git-svn

Browse source 
* git://git.bogomips.org/git-svn:
  git-svn: Avoid spurious errors when rewriteRoot is used.
This commit is contained in:
Junio C Hamano 2009-10-09 02:53:46 -07:00
parent 8ba5effa26 c03c1f798d
commit 63d129d93e
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
git-svn.perl
View file

@ -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: ",