зеркало из https://github.com/microsoft/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>
This commit is contained in:
Родитель
9855b08d35
Коммит
8ff76f4c3b
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче