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

Hello!

Please excuse that I send the patch as an attachment and consider application. Thanks!

Best,

Sebastian

From: Sebastian Pipping <[email protected]>
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(-)

index a8b5fad..cc45ae3 100755
@@ -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

From: Sebastian Pipping <[email protected]>

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" />

---

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(-)

index a8b5fad2..ca6f038 100755
@@ -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

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...

Jakub Narebski
Poland

Ping!

I don't see this trivial fix (admittedly for obscure bug) in "What's cooking", and it is not present in 'master'.

Jakub Narebski
Poland

You are part of my distributed memory and the system is nicely working ;-)

Of course not. Now you reminded me, it will.

Thanks.