[PATCH] Gitweb: Fix unintended "--no-merges" for regular Atom feed
- From
- Sebastian Pipping <sebastian@pipping.org>
- Date
- Apr 2, 2012, 16:44 UTC
- Message-ID
- <4F79D76D.80805@pipping.org>
Hello!
Please excuse that I send the patch as an attachment and consider application. Thanks!
Best,
Sebastian
>From 03bed689671df47040c4a0ad158c0c9b039a50bf Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org> Date: Mon, 2 Apr 2012 18:39:48 +0200 Subject: [PATCH] Gitweb: Fix unintended "--no-merges" for regular Atom feed
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;opt=" type="application/atom+xml" /> <link rel="alternate" title="[..] - Atom feed (no merges)" href="/?p=.git;a=atom;opt=--no-merges" type="application/atom+xml" /> --- gitweb/gitweb.perl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index a8b5fad..cc45ae3 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'} = ''; $href_params{'action'} = $type; $link_attr{'-href'} = href(%href_params); print "<link ".
-- 1.7.8.5