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>
Jakub Narebski committed
Sep 26, 2010 at 13:34 UTC
8ff76f4c3b4e72ac8259465bdf6e33f4da19170d
1 file changed
+1
-1
gitweb/gitweb.perl
+1
-1
@@ -1061,6 +1061,7 @@ sub run_request {
1061
1062
evaluate_uri();
1063
evaluate_gitweb_config();
1064
+ evaluate_git_version();
1065
check_loadavg();
1066
1067
# $projectroot and $projects_list might be set in gitweb config file
@@ -1113,7 +1114,6 @@ sub evaluate_argv {
1114
1115
sub run {
1116
evaluate_argv();
1116
- evaluate_git_version();
1117
1118
$pre_listen_hook->()
1119
if $pre_listen_hook;