| commit | d26c4264e584a1a8cbadbc161fa52cf947f5230a | |
| author | Jakub Narebski <jnareb@gmail.com> | |
| Wed, 16 May 2007 22:05:55 +0000 (17 00:05 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 16 May 2007 23:13:42 +0000 (16 16:13 -0700) | ||
| tree | 521a488a0d2e63f92ac11d2fe85f98ded1fd231d | treesnapshot (tar.gz zip) |
| parent | fdcb769916c93b53517ef1b4cae447a3333c9b86 | commitdiff |
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 <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| gitweb/gitweb.perl | diffblobblamehistory |