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

* git://git.bogomips.org/git-svn: git-svn: Avoid spurious errors when rewriteRoot is used.
git-mirror · Oct 9, 2009 · 63d129d · 63d129d
2 parents 8ba5eff + c03c1f7
commit 63d129d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/git-svn.perl b/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: ",