gitweb: Fix unintended "--no-merges" for regular Atom feed
authorSebastian Pipping <sebastian@pipping.org>
Wed, 4 Apr 2012 12:25:44 +0000 (14:25 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Apr 2012 16:51:00 +0000 (09:51 -0700)
commitcc999a3a0845fcab83a8dcecd3fcdd86f03c10b6
tree35bca14b1bff18905097574876d80f5a4a0085d0
parent7945c7fad05da2ac7f6f1f89202799993a591eac
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>
gitweb/gitweb.perl