Subject: [PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM
Newsgroups: gmane.comp.version-control.git
Date: 2010-09-02 23:54:29 GMT (1 year, 22 weeks, 5 days, 16 hours and 47 minutes ago)
The configuration in /etc/gitweb.conf might specify any old
layout; in particular, it is likely not to be identical to that
which git instaweb sets up. Noticed by Uwe Kleine-König.
Reported-by: Uwe Kleine-König <u.kleine-koenig <at> pengutronix.de>
Cc: Eric Wong <normalperson <at> yhbt.net>
Signed-off-by: Jonathan Nieder <jrnieder <at> gmail.com>
---
git-instaweb.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-instaweb.sh b/git-instaweb.sh
index f608014..6279f4d 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -375,7 +375,8 @@ script='
s#^(my|our) \$projectroot =.*#$1 \$projectroot = "'$(dirname "$fqgitdir")'";#;
s#(my|our) \$gitbin =.*#$1 \$gitbin = "'$GIT_EXEC_PATH'";#;
s#(my|our) \$projects_list =.*#$1 \$projects_list = \$projectroot;#;
-s#(my|our) \$git_temp =.*#$1 \$git_temp = "'$fqgitdir/gitweb/tmp'";#;'
+s#(my|our) \$git_temp =.*#$1 \$git_temp = "'$fqgitdir/gitweb/tmp'";#;
+s#(my|our) \$GITWEB_CONFIG_SYSTEM =.*#$1 \$GITWEB_CONFIG_SYSTEM = "";#;'
gitweb_cgi () {
cat > "$1.tmp" <<\EOFGITWEB
--
1.7.2.2