diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-09 02:53:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-09 02:53:46 -0700 |
| commit | 63d129d93e756dd88f0db9bf6d56e8a7e41aea5d (patch) | |
| tree | bf3f74dbfdc5e25b99847a20ecc1edd7fed24bd1 | |
| parent | 8ba5effa26707fdc5b8a3b10f0fdd3007f657b64 (diff) | |
| parent | c03c1f798d5f865331428e88c7d19b15471d25a8 (diff) | |
| download | git-63d129d93e756dd88f0db9bf6d56e8a7e41aea5d.tar.gz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
git-svn: Avoid spurious errors when rewriteRoot is used.
| -rwxr-xr-x | git-svn.perl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index e0ec258e33..ab65d688fe 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: ", |