Commits

Anonymous committed 63d129d Merge

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

* git://git.bogomips.org/git-svn:
git-svn: Avoid spurious errors when rewriteRoot is used.

Comments (0)

Files changed (1)

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