Code

git-svn: Fix for rewriteRoot URL containing username. v1.6.2-rc1
authorDévai Tamás <devait@mailbox.sk>
Wed, 11 Feb 2009 23:14:02 +0000 (00:14 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Feb 2009 02:04:48 +0000 (18:04 -0800)
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>
git-svn.perl

index 001a1d8efffe804898ddc31e1f64924a429e4c0e..83cb36f0655c0809bb60f1efad78f66ac8de1378 100755 (executable)
@@ -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};