development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 10:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jn/gitweb-patch'

Browse source 
* jn/gitweb-patch:
  gitweb: Do not show 'patch' link for merge commits
This commit is contained in:
Junio C Hamano 2009-10-18 23:01:03 -07:00
parent 178071baa7 1655c98790
commit 023adc077c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gitweb/gitweb.perl
View file

@ -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 {