aboutsummaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2009-10-09 11:01:04 +0400
committerEric Wong <normalperson@yhbt.net>2009-10-09 01:31:05 -0700
commitc03c1f798d5f865331428e88c7d19b15471d25a8 (patch)
treec49aa7b88793f0167309588c6768d383320b32d3 /git-svn.perl
parent8fd2cfa7accd6b8f877014bf3e4bf8547b8e0d2a (diff)
downloadgit-c03c1f798d5f865331428e88c7d19b15471d25a8.tar.gz
git-c03c1f798d5f865331428e88c7d19b15471d25a8.tar.xz
git-svn: Avoid spurious errors when rewriteRoot is used.
After doing a rebase, git-svn checks that the SVN URL is what it expects. However, it does not account for rewriteRoot, which is a legitimate way for the URL to change. This produces a lot of spurious errors. [ew: fixed line wrapping] Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
-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: ",