From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Wed, 5 Nov 2008 22:15:56 +0000 (+0300)
Subject: gitweb: Use single implementation of export_ok check.
X-Git-Tag: v1.6.1-rc1~81
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ec26f098a6593bbd9d396fb7ee74368cdd3eeed3;p=git.git

gitweb: Use single implementation of export_ok check.

GitWeb source contains a special function that implements the
export_ok check, but validate_project still uses a separate copy
of essentially the same code.

This patch makes it use the dedicated function, thus ensuring
that all checks are done through a single code path.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 9d1af7e55..68bdf6265 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -853,8 +853,7 @@ sub validate_project {
 	my $input = shift || return undef;
 	if (!validate_pathname($input) ||
 		!(-d "$projectroot/$input") ||
-		!check_head_link("$projectroot/$input") ||
-		($export_ok && !(-e "$projectroot/$input/$export_ok")) ||
+		!check_export_ok("$projectroot/$input") ||
 		($strict_export && !project_in_list($input))) {
 		return undef;
 	} else {