@matheusbsbs / matheus-bagliano / commits / cc999a3a08

gitweb: Fix unintended "--no-merges" for regular Atom feed

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sebastian Pipping committed Apr 4, 2012 at 14:25 UTC cc999a3a0845fcab83a8dcecd3fcdd86f03c10b6
1 file changed +1
gitweb/gitweb.perl
+1
@@ -3886,6 +3886,7 @@ sub print_feed_meta {
3886 '-type' => "application/$type+xml"
3887 );
3888
3889 + $href_params{'extra_options'} = undef;
3890 $href_params{'action'} = $type;
3891 $link_attr{'-href'} = href(%href_params);
3892 print "<link ".