[PATCH (bugfix)] gitweb: Fix unintended "--no-merges" for regular Atom feed
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Apr 4, 2012, 12:25 UTC
- Message-ID
- <1333542344-20421-1-git-send-email-jnareb@gmail.com>
- In-Reply-To
- <4F79D76D.80805@pipping.org>
From: Sebastian Pipping <sebastian@pipping.org>
The print_feed_meta() subroutine generates links for feeds with and without merges, in RSS and Atom formats. However because %href_params was not properly reset, it generated links with "--no-merges" for all except the very first link.
Before: <link rel="alternate" title="[..] - Atom feed" href="/?p=.git;a=atom;opt=--no-merges" type="application/atom+xml" /> <link rel="alternate" title="[..] - Atom feed (no merges)" href="/?p=.git;a=atom;opt=--no-merges" type="application/atom+xml" />
After: <link rel="alternate" title="[..] - Atom feed" href="/?p=.git;a=atom" type="application/atom+xml" /> <link rel="alternate" title="[..] - Atom feed (no merges)" href="/?p=.git;a=atom;opt=--no-merges" type="application/atom+xml" />
Signed-off-by: Sebastian Pipping <sebastian@pipping.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- Sebastian Pipping wrote:
> Please excuse that I send the patch as an attachment and consider > application. Thanks!
Beside sending this patch as an attachement instead of putting it inline (what was the cause of this?) it was also lacking Signed-off-by... which I have forged.
I have added explanation of this error in the commit message, and changed from using '' to undef to get rid of 'opt' / 'extra_options' parameter instead of having it empty. It is a better way of doing the reset.
Junio, the bug is very minor, so I don't know if it is worth fixing for 1.7.10.
gitweb/gitweb.perl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index a8b5fad2..ca6f038 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3886,6 +3886,7 @@ sub print_feed_meta { '-type' => "application/$type+xml" ); + $href_params{'extra_options'} = undef; $href_params{'action'} = $type; $link_attr{'-href'} = href(%href_params); print "<link ".
-- 1.7.9