Skip to content

Commit 8ff76f4

Browse files
jnarebgitster
authored andcommitted
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>
1 parent 9855b08 commit 8ff76f4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

gitweb/gitweb.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,7 @@ sub run_request {
10611061

10621062
evaluate_uri();
10631063
evaluate_gitweb_config();
1064+
evaluate_git_version();
10641065
check_loadavg();
10651066

10661067
# $projectroot and $projects_list might be set in gitweb config file
@@ -1113,7 +1114,6 @@ sub evaluate_argv {
11131114

11141115
sub run {
11151116
evaluate_argv();
1116-
evaluate_git_version();
11171117

11181118
$pre_listen_hook->()
11191119
if $pre_listen_hook;

0 commit comments

Comments
 (0)