diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:37:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:37:36 -0800 |
| commit | 9453f8aa070bd75bc5fc4bc007223386ab85bb7a (patch) | |
| tree | 63a83b4ffe5d039f2bbf998585d40a086c640688 /gitweb | |
| parent | 46ada61ef1950eb19eae8647b5ac13adb3e14dd2 (diff) | |
| parent | 1655c98790682aed8892eb8a9eb6d44e00d5f69f (diff) | |
| download | git-9453f8aa070bd75bc5fc4bc007223386ab85bb7a.tar.gz git-9453f8aa070bd75bc5fc4bc007223386ab85bb7a.tar.xz | |
Merge branch 'jn/gitweb-patch' into maint
* jn/gitweb-patch:
gitweb: Do not show 'patch' link for merge commits
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 24b219310..c939e2434 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5328,7 +5328,7 @@ sub git_commit { } @$parents ) . ')'; } - if (gitweb_check_feature('patches')) { + if (gitweb_check_feature('patches') && @$parents <= 1) { $formats_nav .= " | " . $cgi->a({-href => href(action=>"patch", -replay=>1)}, "patch"); @@ -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) { $formats_nav .= " | " . $cgi->a({-href => href(action=>"patch", -replay=>1)}, "patch"); @@ -5824,7 +5824,7 @@ sub git_commitdiff_plain { # format-patch-style patches sub git_patch { - git_commitdiff(-format => 'patch', -single=> 1); + git_commitdiff(-format => 'patch', -single => 1); } sub git_patches { |