From: Dévai Tamás <devait@mailbox.sk>
Date: Wed, 11 Feb 2009 23:14:02 +0000 (+0100)
Subject: git-svn: Fix for rewriteRoot URL containing username.
X-Git-Tag: v1.6.2-rc1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2ab92b9af6202f071f069d7d7e1ead0aeb2871da;p=git.git

git-svn: Fix for rewriteRoot URL containing username.

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>
---

diff --git a/git-svn.perl b/git-svn.perl
index 001a1d8ef..83cb36f06 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};