All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Eric Wong <normalperson@yhbt.net>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	git@vger.kernel.org, "Jakub Narebski" <jnareb@gmail.com>,
	"Pavan Kumar Sunkara" <pavan.sss1991@gmail.com>
Subject: [PATCH v2 4/4] instaweb: disable logo and favicon by default
Date: Thu, 2 Sep 2010 21:19:51 -0500	[thread overview]
Message-ID: <20100903021951.GC29302@burratino> (raw)
In-Reply-To: <20100902235722.GE6466@burratino>

Avoid 404 errors due to the missing git logo and favicon.

Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Eric Wong <normalperson@yhbt.net>
Cc: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@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

  reply	other threads:[~2010-09-03  2:21 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20100812131152.2333.9604.reportbug@octopus.hi.pengutronix.de>
2010-09-02 22:12 ` git instaweb for Debian squeeze (Re: Bug#592733: git instaweb broken) Jonathan Nieder
2010-09-02 22:36   ` Eric Wong
2010-09-02 23:52     ` [PATCH/RFC maint-1.7.1 0/4] instaweb 1.7.1 fixes for Debian squeeze Jonathan Nieder
2010-09-02 23:54       ` [PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM Jonathan Nieder
2010-09-03 17:23         ` Junio C Hamano
2010-09-03 18:20           ` Jonathan Nieder
2010-09-03 23:58           ` Jonathan Nieder
2010-09-04  1:36             ` Junio C Hamano
2010-09-04  2:19               ` Jonathan Nieder
2010-09-02 23:55       ` [PATCH 2/4] gitweb: skip logo in atom feed when there is none Jonathan Nieder
2010-09-02 23:56       ` [PATCH 3/4] gitweb: make logo optional Jonathan Nieder
2010-09-02 23:57       ` [PATCH 4/4] instaweb: disable logo and favicon by default Jonathan Nieder
2010-09-03  2:19         ` Jonathan Nieder [this message]
2010-09-03  1:09       ` [PATCH/RFC maint-1.7.1 0/4] instaweb 1.7.1 fixes for Debian squeeze Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100903021951.GC29302@burratino \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    --cc=normalperson@yhbt.net \
    --cc=pavan.sss1991@gmail.com \
    --cc=u.kleine-koenig@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.