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

(refs #1167)Fix commit information in the branch view

Browse Source
This commit is contained in:
Naoki Takezoe
2016-05-05 16:08:38 +09:00
parent 05bfaafe32
commit 35080a9f33
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/gitbucket/core/util/JGitUtil.scala
View File

@@ -896,17 +896,13 @@ object JGitUtil {
git.branchList.call.asScala.map { ref => git.branchList.call.asScala.map { ref =>
val walk = new RevWalk(repo) val walk = new RevWalk(repo)
try { try {
val defaultCommit = walk.parseCommit(defaultObject) val defaultCommit = walk.parseCommit(defaultObject)
val branchName = ref.getName.stripPrefix("refs/heads/") val branchName = ref.getName.stripPrefix("refs/heads/")
val branchCommit = if(branchName == defaultBranch){ val branchCommit = walk.parseCommit(ref.getObjectId)
defaultCommit val when = branchCommit.getCommitterIdent.getWhen
} else { val committer = branchCommit.getCommitterIdent.getName
walk.parseCommit(ref.getObjectId)
}
val when = branchCommit.getCommitterIdent.getWhen
val committer = branchCommit.getCommitterIdent.getName
val committerEmail = branchCommit.getCommitterIdent.getEmailAddress val committerEmail = branchCommit.getCommitterIdent.getEmailAddress
val mergeInfo = if(origin && branchName == defaultBranch){ val mergeInfo = if(origin && branchName == defaultBranch){
None None
} else { } else {
walk.reset() walk.reset()