Re: [PATCH (bugfix)] gitweb: Fix unintended "--no-merges" for regular Atom feed
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Apr 4, 2012, 18:58 UTC
- Message-ID
- <201204042058.32549.jnareb@gmail.com>
- In-Reply-To
- <7v62df9yo5.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
Show 9 quoted lines
> Jakub Narebski <jnareb@gmail.com> writes: > > > Junio, the bug is very minor, so I don't know if it is worth fixing > > for 1.7.10. > > Does this exist in 1.7.9.x maintenance track? If it is an old bug, I do > not think it should go to 1.7.10 proper (perhaps 1.7.10.1) this late, and > if it is a bug in a new feature added for 1.7.10, we may want to fix it > before the final, as the impact of the patch seems very minor.
It is an old bug, from 05bb5a2 (gitweb: Include links to feeds in HTML header only for '200 OK' response, 2010-12-18) which refactored feed link generation into print_feed_meta(). It is in gitweb since v1.7.4 I think.
So 1.7.10.1 it is...
Show 16 quoted lines
> > 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 ".
> -- Jakub Narebski Poland