[PATCH] git-svn: Avoid spurious errors when rewriteRoot is used.
From: Alexander Gavrilov <hidden>
Date: 2016-06-15 22:47:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
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. Signed-off-by: Alexander Gavrilov <redacted> --- git-svn.perl | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index e0ec258..e9030ff 100755
--- a/git-svn.perl
+++ b/git-svn.perl@@ -603,8 +603,12 @@ 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: ",
--
1.6.3.2.13.g94af7