X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/ed433e486ee9aa30b6685a586a09ac0a32dcf98d879ccc9ced5ed2eb6a52422f..71c596262ba5ab1eb6a961e48359b48ee9fdacd23f7bc5ea4cf00cb1165b19a5:/gitweb.perl?ds=sidebyside

diff --git a/gitweb.perl b/gitweb.perl
index 7e1e27a..924d626 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -5510,7 +5510,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");
@@ -5798,7 +5798,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");
@@ -6006,7 +6006,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 {