summaryrefslogtreecommitdiffstats
path: root/src/com/gitblit/utils/DiffUtils.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-05-29 14:04:38 -0400
committerJames Moger <james.moger@gitblit.com>2011-05-29 14:04:38 -0400
commitdb653ae29c54163c7ca2dd6d2b5063d4623c3a8c (patch)
tree79374dca46b41a133fc99a54c3705cc79dc7f34b /src/com/gitblit/utils/DiffUtils.java
parentec97f716023c0bbd6a9e11cbe7144973cf1c103d (diff)
downloadgitblit-db653ae29c54163c7ca2dd6d2b5063d4623c3a8c.tar.gz
gitblit-db653ae29c54163c7ca2dd6d2b5063d4623c3a8c.zip
Unit testing.
Diffstat (limited to 'src/com/gitblit/utils/DiffUtils.java')
-rw-r--r--src/com/gitblit/utils/DiffUtils.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/gitblit/utils/DiffUtils.java b/src/com/gitblit/utils/DiffUtils.java
index c9d0fc36..969cb916 100644
--- a/src/com/gitblit/utils/DiffUtils.java
+++ b/src/com/gitblit/utils/DiffUtils.java
@@ -35,23 +35,23 @@ import com.gitblit.utils.JGitUtils.DiffOutputType;
public class DiffUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(DiffUtils.class);
-
+
public static String getCommitDiff(Repository r, RevCommit commit, DiffOutputType outputType) {
- return getCommitDiff(r, null, commit, null, outputType);
+ return getDiff(r, null, commit, null, outputType);
}
- public static String getCommitDiff(Repository r, RevCommit commit, String path,
+ public static String getDiff(Repository r, RevCommit commit, String path,
DiffOutputType outputType) {
- return getCommitDiff(r, null, commit, path, outputType);
+ return getDiff(r, null, commit, path, outputType);
}
- public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,
+ public static String getDiff(Repository r, RevCommit baseCommit, RevCommit commit,
DiffOutputType outputType) {
- return getCommitDiff(r, baseCommit, commit, null, outputType);
+ return getDiff(r, baseCommit, commit, null, outputType);
}
- public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,
- String path, DiffOutputType outputType) {
+ public static String getDiff(Repository r, RevCommit baseCommit, RevCommit commit, String path,
+ DiffOutputType outputType) {
try {
RevTree baseTree;
if (baseCommit == null) {