undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: minimally fix "fork" support.

Browse Source 
A forked project is defined to be $projname/$forkname.git for
$projname.git; the code did not check this correctly and mistook
$projname/.git to be a fork of itself.  This minimally fixes the
breakage.

Also forks were not checked when index.aux file was in use.
Listing the forked ones in index.aux would show them also on the
toplevel index which may go against the hierarchical nature of
forks, but again this is a minimal fix to whip it in a better
shape suitable to be in the 'master' branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-11-07 22:37:17 -08:00
parent 5dd5ed09fe
commit 83ee94c12c
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gitweb/gitweb.perl
View File

@ -962,6 +962,17 @@ sub git_get_projects_list {
if (!defined $path) {
next;
}
if ($filter ne '') {
# looking for forks;
my $pfx = substr($path, 0, length($filter));
if ($pfx ne $filter) {
next;
}
my $sfx = substr($path, length($filter));
if ($sfx !~ /^\/.*\.git$/) {
next;
}
}
if (check_export_ok("$projectroot/$path")) {
my $pr = {
path => $path,
@ -2230,8 +2241,14 @@ sub git_project_list_body {
}
if ($check_forks) {
my $pname = $pr->{'path'};
$pname =~ s/\.git$//;
$pr->{'forks'} = -d "$projectroot/$pname";
if (($pname =~ s/\.git$//) &&
($pname !~ /\/$/) &&
(-d "$projectroot/$pname")) {
$pr->{'forks'} = "-d $projectroot/$pname";
}
else {
$pr->{'forks'} = 0;
}
}
push @projects, $pr;
}
@ -2297,6 +2314,7 @@ sub git_project_list_body {
if ($check_forks) {
print "<td>";
if ($pr->{'forks'}) {
print "<!-- $pr->{'forks'} -->\n";
print $cgi->a({-href => href(project=>$pr->{'path'}, action=>"forks")}, "+");
}
print "</td>\n";