Subject: [PATCH v2 4/4] instaweb: disable logo and favicon by default
Newsgroups: gmane.comp.version-control.git
Date: 2010-09-03 02:19:51 GMT (1 year, 22 weeks, 5 days, 12 hours and 7 minutes ago)
Avoid 404 errors due to the missing git logo and favicon.
Reported-by: Uwe Kleine-König <u.kleine-koenig <at> pengutronix.de>
Cc: Eric Wong <normalperson <at> yhbt.net>
Cc: Jakub Narebski <jnareb <at> gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder <at> gmail.com>
---
Jonathan Nieder wrote:
> --- a/git-instaweb.sh
> +++ b/git-instaweb.sh
> @@ -376,7 +376,9 @@ 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) \$GITWEB_CONFIG_SYSTEM =.*#$1 \$GITWEB_CONFIG_SYSTEM = "";#;'
> +s#(my|our) \$GITWEB_CONFIG_SYSTEM =.*#$1 \$GITWEB_CONFIG_SYSTEM = "";#;
> +s#(my|our) \$favicon =.*#$1 \$favicon = undef;#;'
> +s#(my|our) \$logo =.*#$1 \$logo = undef;#;'
Stray apostrophe; sorry about that. Here's a replacement.
git-instaweb.sh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 6279f4d..0725596 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -376,7 +376,9 @@ 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) \$GITWEB_CONFIG_SYSTEM =.*#$1 \$GITWEB_CONFIG_SYSTEM = "";#;'
+s#(my|our) \$GITWEB_CONFIG_SYSTEM =.*#$1 \$GITWEB_CONFIG_SYSTEM = "";#;
+s#(my|our) \$favicon =.*#$1 \$favicon = undef;#;
+s#(my|our) \$logo =.*#$1 \$logo = undef;#;'
gitweb_cgi () {
cat > "$1.tmp" <<\EOFGITWEB
--
1.7.2.2