Fix dcommit, rebase when rewriteRoot is in use
[gitweb.git] / git-svn.perl
index a4ab05155d915fa8f2d8652b5912a447597e091a..29f39c0831227a2a7c7b482cdf8277e95cf63245 100755 (executable)
@@ -1535,9 +1535,14 @@ sub find_by_url { # repos_root and, path are optional
                                            $remotes->{$repo_id}->{$_});
                }
                my $p = $path;
+               my $rwr = rewrite_root({repo_id => $repo_id});
                unless (defined $p) {
                        $p = $full_url;
-                       $p =~ s#^\Q$u\E(?:/|$)## or next;
+                       my $z = $u;
+                       if ($rwr) {
+                               $z = $rwr;
+                       }
+                       $p =~ s#^\Q$z\E(?:/|$)## or next;
                }
                foreach my $f (keys %$fetch) {
                        next if $f ne $p;