Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  git-svn: support intermediate paths when matching tags/branches
maint
Junio C Hamano 2009-03-09 18:38:18 -07:00
commit c4994ce953
1 changed files with 4 additions and 1 deletions

View File

@ -2351,7 +2351,10 @@ sub match_paths {
if (my $path = $paths->{"/$self->{path}"}) { if (my $path = $paths->{"/$self->{path}"}) {
return ($path->{action} eq 'D') ? 0 : 1; return ($path->{action} eq 'D') ? 0 : 1;
} }
$self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//; my $repos_root = $self->ra->{repos_root};
my $extended_path = $self->{url} . '/' . $self->{path};
$extended_path =~ s#^\Q$repos_root\E(/|$)##;
$self->{path_regex} ||= qr/^\/\Q$extended_path\E\//;
if (grep /$self->{path_regex}/, keys %$paths) { if (grep /$self->{path_regex}/, keys %$paths) {
return 1; return 1;
} }