From: Jakub Narebski <redacted>
Date: Wed, 16 May 2007 22:05:55 +0000 (+0200)
Subject: gitweb: Empty patch for merge means trivial merge, not no differences
X-Git-Url: https://git.ladys.computer/Gitweb/commitdiff_plain/9e67a486a69986f7b58d77ed89fe7bfcb6d250503c67558d2c2e4f87d0a1a1b2

gitweb: Empty patch for merge means trivial merge, not no differences

Earlier commit 4280cde95fa4e3fb012eb6d0c239a7777baaf60c made gitweb
show "No differences found" message for empty diff, for the HTML
output. But for merge commits, either -c format we use or --cc format,
empty diff doesn't mean no differences, but trivial merge.

Show "Trivial merge" message instead of "No differences found" for
merges.

While at it reword conditional in the code for easier reading.

Signed-off-by: Jakub Narebski <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/gitweb.perl b/gitweb.perl
index 52e3461..6934d1b 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -2878,7 +2878,14 @@ sub git_patchset_body {
 	} continue {
 		print "</div>\n"; # class="patch"
 	}
-	print "<div class=\"diff nodifferences\">No differences found</div>\n" if (!$patch_number);
+
+	if ($patch_number == 0) {
+		if (@hash_parents > 1) {
+			print "<div class=\"diff nodifferences\">Trivial merge</div>\n";
+		} else {
+			print "<div class=\"diff nodifferences\">No differences found</div>\n";
+		}
+	}
 
 	print "</div>\n"; # class="patchset"
 }