From 35080a9f3377daeb3ed8cd7316588ed6e2bb07b8 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Thu, 5 May 2016 16:08:38 +0900 Subject: [PATCH] (refs #1167)Fix commit information in the branch view --- .../scala/gitbucket/core/util/JGitUtil.scala | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index 2a1182fae..230fa6f8a 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -896,17 +896,13 @@ object JGitUtil { git.branchList.call.asScala.map { ref => val walk = new RevWalk(repo) try { - val defaultCommit = walk.parseCommit(defaultObject) - val branchName = ref.getName.stripPrefix("refs/heads/") - val branchCommit = if(branchName == defaultBranch){ - defaultCommit - } else { - walk.parseCommit(ref.getObjectId) - } - val when = branchCommit.getCommitterIdent.getWhen - val committer = branchCommit.getCommitterIdent.getName + val defaultCommit = walk.parseCommit(defaultObject) + val branchName = ref.getName.stripPrefix("refs/heads/") + val branchCommit = walk.parseCommit(ref.getObjectId) + val when = branchCommit.getCommitterIdent.getWhen + val committer = branchCommit.getCommitterIdent.getName val committerEmail = branchCommit.getCommitterIdent.getEmailAddress - val mergeInfo = if(origin && branchName == defaultBranch){ + val mergeInfo = if(origin && branchName == defaultBranch){ None } else { walk.reset()