From: Jakub Narebski <jnareb@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, John 'Warthog9' Hawley <warthog9@kernel.org>,
Eric Wong <normalperson@yhbt.net>
Subject: Re: [PATCH 1/2] gitweb: skip logo in atom feed when there is none
Date: Wed, 5 Jan 2011 01:25:52 +0100 [thread overview]
Message-ID: <201101050125.52824.jnareb@gmail.com> (raw)
In-Reply-To: <20110104050247.GB8280@burratino>
Jonathan Nieder wrote:
> Date: Fri, 3 Sep 2010 19:44:39 -0500
>
> With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: it is $logo,
> not $logo_url, 2006-12-04), the logo URI to be written to Atom
> feeds was corrected but the case of no logo forgotten.
>
> Acked-by: Eric Wong <normalperson@yhbt.net>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Good catch. As an obvious bugfix:
Acked-by: Jakub Narebski <jnareb@gmail.com>
> ---
> gitweb/gitweb.perl | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 4779618..c65af1a 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -7169,7 +7169,7 @@ XML
> if (defined $favicon) {
> print "<icon>" . esc_url($favicon) . "</icon>\n";
> }
> - if (defined $logo_url) {
> + if (defined $logo) {
> # not twice as wide as tall: 72 x 27 pixels
> print "<logo>" . esc_url($logo) . "</logo>\n";
> }
> --
> 1.7.4.rc0
>
>
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2011-01-05 0:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-04 5:02 [PATCH 0/2] gitweb: make logo optional Jonathan Nieder
2011-01-04 5:02 ` [PATCH 1/2] gitweb: skip logo in atom feed when there is none Jonathan Nieder
2011-01-05 0:25 ` Jakub Narebski [this message]
2011-01-05 0:45 ` Junio C Hamano
2011-01-04 5:05 ` [PATCH 2/2] gitweb: make logo optional Jonathan Nieder
2011-01-04 11:52 ` Jakub Narebski
2011-01-04 16:29 ` Jonathan Nieder
2011-01-04 23:24 ` [PATCH 0/2] " 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=201101050125.52824.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=normalperson@yhbt.net \
--cc=warthog9@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).