git-svn: Avoid spurious errors when rewriteRoot is used.
PATCH 1/1 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.
Signed-off-by Alexander Gavrilov <[email protected]>
--- git-svn.perl | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
git-svn.perl +6 -2
@@ -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: ",
Signature · 1 line
1.6.3.2.13.g94af7
Quoted 6 lines · Alexander Gavrilov
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 <[email protected]>
Thanks Alexander,
Acked-by Eric Wong <[email protected]>
Fixed some line wrapping and pushed out to
git://git.bogomips.org/git-svn
Signature · 1 line
Eric Wong
Quoted 6 lines · Eric Wong
Thanks Alexander,
Acked-by Eric Wong <[email protected]>Fixed some line wrapping and pushed out to
git://git.bogomips.org/git-svn
Thanks.