aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-09 02:53:46 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-09 02:53:46 -0700
commit63d129d93e756dd88f0db9bf6d56e8a7e41aea5d (patch)
treebf3f74dbfdc5e25b99847a20ecc1edd7fed24bd1
parent8ba5effa26707fdc5b8a3b10f0fdd3007f657b64 (diff)
parentc03c1f798d5f865331428e88c7d19b15471d25a8 (diff)
downloadgit-63d129d93e756dd88f0db9bf6d56e8a7e41aea5d.tar.gz
git-63d129d93e756dd88f0db9bf6d56e8a7e41aea5d.tar.xz
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: git-svn: Avoid spurious errors when rewriteRoot is used.
-rwxr-xr-xgit-svn.perl11
1 files changed, 9 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl
index e0ec258e3..ab65d688f 100755
--- 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: ",