From a645ba09d693495c50ab0ee0d1fc2734407b73a4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 21 Apr 2011 20:50:59 -0400
Subject: [PATCH] Added merge icon. Added commit legend with counts. Improved header.
---
src/com/gitblit/utils/GitBlitDiffFormatter.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/utils/GitBlitDiffFormatter.java b/src/com/gitblit/utils/GitBlitDiffFormatter.java
index 54cb6c2..b8dceb4 100644
--- a/src/com/gitblit/utils/GitBlitDiffFormatter.java
+++ b/src/com/gitblit/utils/GitBlitDiffFormatter.java
@@ -97,6 +97,10 @@
// skip index lines
} else if (line.startsWith("new file")) {
// skip new file lines
+ } else if (line.startsWith("\\ No newline")) {
+ // skip no new line
+ } else if (line.startsWith("---") || line.startsWith("+++")) {
+ // skip --- +++ lines
} else if (line.startsWith("diff")) {
if (line.indexOf(oldnull) > -1) {
// a is null, use b
@@ -115,8 +119,6 @@
sb.append("<div class=\"diff\">");
sb.append("<table><tbody>");
inFile = true;
- } else if (line.startsWith("---") || line.startsWith("+++")) {
- // skip --- +++ lines
} else {
sb.append(line).append('\n');
}
--
Gitblit v1.9.1