From 5e7afa0f416a13e17fca5cc6520fcdbbf352cc5e Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 4 Oct 2017 18:16:56 +0900 Subject: [PATCH] (refs #1727) Repair the commit diff view --- .../gitbucket/core/controller/RepositoryViewerController.scala | 2 +- .../scala/gitbucket/core/servlet/GitRepositoryServlet.scala | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index 1f55d4362..ea2d903ca 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -432,7 +432,7 @@ trait RepositoryViewerControllerBase extends ControllerBase { try { using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) { revCommit => - JGitUtil.getDiffs(git, id, false) match { + JGitUtil.getDiffs(git, id, true) match { case (diffs, oldCommitId) => html.commit(id, new JGitUtil.CommitInfo(revCommit), JGitUtil.getBranchesOfCommit(git, revCommit.getName), diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala index 521f1397a..2fa3859b2 100644 --- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala @@ -351,7 +351,6 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: diffs._1.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") => val action = if(diff.changeType == ChangeType.ADD) "created" else "edited" val fileName = diff.newPath - //println(action + " - " + fileName + " - " + commit.id) (action, fileName, commit.id) } }