threads / patch / 25249

patchgitweb: Move call to evaluate_git_version after evaluate_gitweb_config

Subject: [PATCH] gitweb: Move call to evaluate_git_version after evaluate_gitweb_config

## tl;dr

One message between Sep 26, 2010 and Sep 26, 2010. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Jakub Narebski· Sep 26, 2010, 11:34 UTC · lore

This means that call to evaluate_git_version() is now inside run_request(), which means that is called for each request instead of once per starting gitweb; this matter currently only when using FastCGI interface (gitweb.fcgi).

This change was done becayse evaluate_git_version() uses $GIT variable, which can be set / modified by gitweb config file... and it 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>
---
 gitweb/gitweb.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to gitweb/gitweb.perl +1 −1
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index a85e2f6..d521b4c 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;

← back to recent threads