From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 09 Oct 2009 12:23:50 GMT
Subject: Re: [PATCH v2] gitweb: Do not show 'patch' link for merge commits
Message-ID: <200910091423.51286.jnareb@gmail.com>
In-Reply-To: <200910091410.15904.jnareb@gmail.com>

Jakub Narebski wrote:

> @@ -5616,7 +5616,7 @@ sub git_commitdiff {
>                 $formats_nav =
>                         $cgi->a({-href => href(action=>"commitdiff_plain", -replay=>1)},
>                                 "raw");
> -               if ($patch_max) {
> +               if ($patch_max &&  && @{$co{'parents'}} <= 1) {

Gaaaah. It should be "&&", not "&&  &&".  I'm extremely sorry!

>                         $formats_nav .= " | " .
>                                 $cgi->a({-href => href(action=>"patch", -replay=>1)},
>                                         "patch");

-- 
Jakub Narebski
Poland