From 2b1e02997f12e2cf12088d2e9f6eef107e1ce8f5 Mon Sep 17 00:00:00 2001 From: paladox <paladox@users.noreply.github.com> Date: Mon, 23 Nov 2015 13:32:00 -0500 Subject: [PATCH] Match longest repository path towards the shortest pr-950 --- src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java b/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java index 187e460..adf815e 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java +++ b/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java @@ -57,7 +57,7 @@ RevCommit parent = commit.getParentCount() == 0 ? null : commit.getParent(0); ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName, parent.getName(), commit.getName(), imageExtensions); - diff = DiffUtils.getDiff(r, commit, blobPath, diffComparator, DiffOutputType.HTML, handler).content; + diff = DiffUtils.getDiff(r, commit, blobPath, diffComparator, DiffOutputType.HTML, handler, 3).content; if (handler.getImgDiffCount() > 0) { addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs } @@ -68,7 +68,7 @@ RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId); ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName, baseCommit.getName(), commit.getName(), imageExtensions); - diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, diffComparator, DiffOutputType.HTML, handler).content; + diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, diffComparator, DiffOutputType.HTML, handler, 3).content; if (handler.getImgDiffCount() > 0) { addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs } -- Gitblit v1.9.1