summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDévai Tamás <devait@mailbox.sk>2009-02-11 23:14:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-16 02:04:48 (GMT)
commit1b7e543a6e2f156536a3cf227f9da1029bba6265 (patch)
tree5d312b75413ac3969a8aa33ddac7ead1f41440b7
parent88a667f0630e8b9c7679127d3b9364447727e587 (diff)
downloadgit-1.6.2-rc1.zip
git-1.6.2-rc1.tar.gz
git-1.6.2-rc1.tar.bz2
git-svn: Fix for rewriteRoot URL containing username.v1.6.2-rc1
If the new svn root URL given with the svn-remote.<repo>.rewriteRoot config option (or by the --rewrite-root option to 'git svn init') contains a username (such as 'svn+ssh://username@example.com/repo'), find_by_url() cannot find the repository URL, because the URL contained in the commit message does have the username removed. Signed-off-by: Dévai Tamás <devait@mailbox.sk> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-svn.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 001a1d8..83cb36f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1693,6 +1693,7 @@ sub find_by_url { # repos_root and, path are optional
my $prefix = '';
if ($rwr) {
$z = $rwr;
+ remove_username($z);
} elsif (defined $svm) {
$z = $svm->{source};
$prefix = $svm->{replace};