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

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 351f524ee1fdde0391450146bf8fff3babceaaf5e9604e0e041267a21d98b021..144b9684ab71e5461d8641e11ffafec7d5c106d3303387ee865a983e26cc0973 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -3887,6 +3887,7 @@ sub print_feed_meta {
                                '-type' => "application/$type+xml"
                        );
 
                                '-type' => "application/$type+xml"
                        );
 

+                       $href_params{'extra_options'} = undef;

                        $href_params{'action'} = $type;
                        $link_attr{'-href'} = href(%href_params);
                        print "<link ".
                        $href_params{'action'} = $type;
                        $link_attr{'-href'} = href(%href_params);
                        print "<link ".