Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-15 18:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1727) Repair the commit diff view

Browse Source
This commit is contained in:
Naoki Takezoe
2017-10-04 18:16:56 +09:00
parent badc9b5117
commit 5e7afa0f41
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -432,7 +432,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
try { try {
using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) { revCommit => defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) { revCommit =>
JGitUtil.getDiffs(git, id, false) match { JGitUtil.getDiffs(git, id, true) match {
case (diffs, oldCommitId) => case (diffs, oldCommitId) =>
html.commit(id, new JGitUtil.CommitInfo(revCommit), html.commit(id, new JGitUtil.CommitInfo(revCommit),
JGitUtil.getBranchesOfCommit(git, revCommit.getName), JGitUtil.getBranchesOfCommit(git, revCommit.getName),

1
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
View File

@@ -351,7 +351,6 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
diffs._1.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") => diffs._1.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") =>
val action = if(diff.changeType == ChangeType.ADD) "created" else "edited" val action = if(diff.changeType == ChangeType.ADD) "created" else "edited"
val fileName = diff.newPath val fileName = diff.newPath
//println(action + " - " + fileName + " - " + commit.id)
(action, fileName, commit.id) (action, fileName, commit.id)
} }
} }