From: Jakub Narebski <jnareb@gmail.com>
Date: Sun, 26 Sep 2010 11:34:56 +0000 (+0200)
Subject: gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
X-Git-Tag: v1.7.4-rc0~145^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8ff76f4c3b4e72ac8259465bdf6e33f4da19170d;p=git.git

gitweb: Move call to evaluate_git_version after evaluate_gitweb_config

Now evaluate_git_version() is inside run_request() to be called for each
request, instead of once per starting gitweb; this currently matters only
when using FastCGI interface (gitweb.fcgi).

This change was done because evaluate_git_version() uses $GIT variable,
which can be set / modified by gitweb config file, but the variable is
modified this way by gitweb config file used in gitweb tests.  Without
this change there is spurious extra output from t9500 test when tests are
run with '--debug' option.

Signed-off-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 a85e2f631..d521b4cf8 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1061,6 +1061,7 @@ sub run_request {
 
 	evaluate_uri();
 	evaluate_gitweb_config();
+	evaluate_git_version();
 	check_loadavg();
 
 	# $projectroot and $projects_list might be set in gitweb config file
@@ -1113,7 +1114,6 @@ sub evaluate_argv {
 
 sub run {
 	evaluate_argv();
-	evaluate_git_version();
 
 	$pre_listen_hook->()
 		if $pre_listen_hook;