From 8fa8cbcf9db40fea41d7a555c86428aede7f25e8 Mon Sep 17 00:00:00 2001
From: Tom <tw201207@gmail.com>
Date: Thu, 06 Nov 2014 12:06:47 -0500
Subject: [PATCH] Fix a copy/paste error in a comment.
---
src/main/java/com/gitblit/utils/DiffUtils.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/DiffUtils.java b/src/main/java/com/gitblit/utils/DiffUtils.java
index b49497e..f597b94 100644
--- a/src/main/java/com/gitblit/utils/DiffUtils.java
+++ b/src/main/java/com/gitblit/utils/DiffUtils.java
@@ -228,15 +228,16 @@
DiffStat stat = null;
String diff = null;
try {
- final ByteArrayOutputStream os = new ByteArrayOutputStream();
+ ByteArrayOutputStream os = null;
RawTextComparator cmp = RawTextComparator.DEFAULT;
DiffFormatter df;
switch (outputType) {
case HTML:
- df = new GitBlitDiffFormatter(os, commit.getName());
+ df = new GitBlitDiffFormatter(commit.getName(), path);
break;
case PLAIN:
default:
+ os = new ByteArrayOutputStream();
df = new DiffFormatter(os);
break;
}
@@ -271,6 +272,7 @@
} else {
df.format(diffEntries);
}
+ df.flush();
if (df instanceof GitBlitDiffFormatter) {
// workaround for complex private methods in DiffFormatter
diff = ((GitBlitDiffFormatter) df).getHtml();
@@ -278,7 +280,6 @@
} else {
diff = os.toString();
}
- df.flush();
} catch (Throwable t) {
LOGGER.error("failed to generate commit diff!", t);
}
@@ -363,19 +364,19 @@
public static DiffStat getDiffStat(Repository repository, String base, String tip) {
RevCommit baseCommit = null;
RevCommit tipCommit = null;
- RevWalk revWalk = null;
+ RevWalk revWalk = new RevWalk(repository);
try {
- revWalk = new RevWalk(repository);
tipCommit = revWalk.parseCommit(repository.resolve(tip));
if (!StringUtils.isEmpty(base)) {
baseCommit = revWalk.parseCommit(repository.resolve(base));
}
+ return getDiffStat(repository, baseCommit, tipCommit, null);
} catch (Exception e) {
LOGGER.error("failed to generate diffstat!", e);
} finally {
revWalk.dispose();
}
- return getDiffStat(repository, baseCommit, tipCommit, null);
+ return null;
}
public static DiffStat getDiffStat(Repository repository, RevCommit commit) {
--
Gitblit v1.9.1