summaryrefslogtreecommitdiff
path: root/gitweb/gitweb.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-17 14:59:22 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-17 14:59:22 -0800
commit430fac9e5bdf24a2969f854ff0ff376140f88090 (patch)
tree97af5770aa6afef8fc1739ca5496b1c3ca6ce869 /gitweb/gitweb.perl
parent8cf666c9eea7d6c40784efde545c9d00edea1959 (diff)
parent9b93aeb29cea16880926bc150ac31cfb31475a44 (diff)
downloadgit-430fac9e5bdf24a2969f854ff0ff376140f88090.tar.gz
Merge branch 'jn/gitweb-test'
* jn/gitweb-test: gitweb/Makefile: Include gitweb/config.mak gitweb/Makefile: Add 'test' and 'test-installed' targets t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
Diffstat (limited to 'gitweb/gitweb.perl')
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 253f41adc9..679f2da3ee 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1075,6 +1075,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
@@ -1127,7 +1128,6 @@ sub evaluate_argv {
sub run {
evaluate_argv();
- evaluate_git_version();
$pre_listen_hook->()
if $pre_listen_hook;