From 83ee94c12ca16ef020f3d71eda34b6559ed6dc67 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Tue, 7 Nov 2006 22:37:17 -0800
Subject: [PATCH] gitweb: minimally fix "fork" support.

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>
---
 gitweb/gitweb.perl | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 680832c98..c46629f82 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -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";
-- 
2.30.2