diff options
Diffstat (limited to 'src/com/gitblit/utils/GitBlitDiffFormatter.java')
| -rw-r--r-- | 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 54cb6c29..b8dceb47 100644 --- a/src/com/gitblit/utils/GitBlitDiffFormatter.java +++ b/src/com/gitblit/utils/GitBlitDiffFormatter.java @@ -97,6 +97,10 @@ public class GitBlitDiffFormatter extends GitWebDiffFormatter { // 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 @@ public class GitBlitDiffFormatter extends GitWebDiffFormatter { 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');
}
|