gitweb: require $ENV{'GITWEB_CONFIG'}

With this patch it is possible to use gitweb.perl for developing by
loading the configuration from $GITWEB_CONFIG.  This might also be
useful for normal usage of gitweb.

Example:

    % cat cfg
    $GIT = '/usr/bin/git';
    $projectroot = '/home/matled/src/git';
    $projects_list = '/home/matled/src/git/git/gitweb/list';
    % cat run
    #!/bin/sh
    export GATEWAY_INTERFACE="CGI/1.1"
    export HTTP_ACCEPT="*/*"
    export REQUEST_METHOD="GET"
    export GITWEB_CONFIG='./cfg'
    export QUERY_STRING=""$1""
    exec ./gitweb.perl
    % time ./run p=git/.git > /dev/null

This makes it easy to check for warnings and do performance tests
after changes, you can also pipe this to lynx -dump -force-html
/dev/stdin to get more than just html.

This also documents the original patch adding require $GITWEB_CONFIG.

Signed-off-by: Matthias Lederhofer <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/README b/README
index 128a1a7ae8c75c429bbc9151011bca5c27c50445095e62112e9870f8b64324fd..a1f7b18511d8ae380bbfc396ddd9b4c52e6ebfb62fb31eb0da6b870e227ea7cc 100644 (file)
--- a/README
+++ b/README
@@ -23,6 +23,11 @@ You can specify the following configuration variables when building GIT:
    Points to the location where you put gitweb.css on your web server.
  * GITWEB_LOGO
    Points to the location where you put git-logo.png on your web server.
+ * GITWEB_CONFIG
+   This file will be loaded using 'require'.  If the environment
+   $GITWEB_CONFIG is set when gitweb.cgi is executed the file in the
+   environment variable will be loaded instead of the file
+   specified when gitweb.cgi was created.
 
 Originally written by:
   Kay Sievers <kay.sievers@vrfy.org>

diff --git a/gitweb.perl b/gitweb.perl
index 92b96af09dd6ac7a350606be795f7f640655fc587f2dc04c8464efad4ff161fd..db2bb7e0885759be20623d4b501b1f48806138482acde20a4ae8ef4b193a068e 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -60,7 +60,7 @@ our $default_text_plain_charset  = undef;
 # (relative to the current git repository)
 our $mimetypes_file = undef;
 
-our $GITWEB_CONFIG = "@@GITWEB_CONFIG@@";
+our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "@@GITWEB_CONFIG@@";
 require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
 
 # version of the core git binary