[PATCH 7/6] gitweb: Empty patch for merge means trivial merge, not no differences
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- May 16, 2007, 22:05 UTC
- Message-ID
- <11793531552023-git-send-email-jnareb@gmail.com>
- In-Reply-To
- <11784930091585-git-send-email-jnareb@gmail.com>
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 <jnareb@gmail.com> --- gitweb/gitweb.perl | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 549e027..8c688be 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2877,7 +2877,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" }
-- 1.5.1.4