summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2015-05-22 10:45:34 -0600
committerJames Moger <james.moger@gitblit.com>2015-05-22 10:45:34 -0600
commit99450c557d895c94e7eec618218d0f4bc5c16ffd (patch)
treebb26a94b98cf0bd7c4791841c93518c9b0628aa3
parent5c40bee1e1ee09658b3d9be285060be15ee9f452 (diff)
parent864428ff6774672860633d10fa20023f5ffe9230 (diff)
downloadgitblit-99450c557d895c94e7eec618218d0f4bc5c16ffd.tar.gz
gitblit-99450c557d895c94e7eec618218d0f4bc5c16ffd.zip
Merged #252 "Cleanup diff rename output"
-rw-r--r--src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
index 8f0d223a..35549d4e 100644
--- a/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
+++ b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
@@ -473,7 +473,8 @@ public class GitBlitDiffFormatter extends DiffFormatter {
String[] lines = html.split("\n");
StringBuilder sb = new StringBuilder();
for (String line : lines) {
- if (line.startsWith("index")) {
+ if (line.startsWith("index") || line.startsWith("similarity")
+ || line.startsWith("rename from ") || line.startsWith("rename to ")) {
// skip index lines
} else if (line.startsWith("new file") || line.startsWith("deleted file")) {
// skip new file lines