Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-07 14:36:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1470)Fix branch indicator

Browse Source
This commit is contained in:
Naoki Takezoe
2017-03-02 16:31:23 +09:00
parent 32c307b5a5
commit b6390ac383
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -955,11 +955,7 @@ object JGitUtil {
def getBranches(owner: String, name: String, defaultBranch: String, origin: Boolean): Seq[BranchInfo] = {
using(Git.open(getRepositoryDir(owner, name))){ git =>
val repo = git.getRepository
val defaultObject = if (repo.getAllRefs.keySet().contains(defaultBranch)) {
repo.resolve(defaultBranch)
} else {
git.branchList().call().iterator().next().getObjectId
}
val defaultObject = repo.resolve(defaultBranch)
git.branchList.call.asScala.map { ref =>
val walk = new RevWalk(repo)
@@ -974,7 +970,7 @@ object JGitUtil {
None
} else {
walk.reset()
walk.setRevFilter( RevFilter.MERGE_BASE )
walk.setRevFilter(RevFilter.MERGE_BASE)
walk.markStart(branchCommit)
walk.markStart(defaultCommit)
val mergeBase = walk.next()
@@ -987,7 +983,7 @@ object JGitUtil {
}
BranchInfo(branchName, committer, when, committerEmail, mergeInfo, ref.getObjectId.name)
} finally {
walk.dispose();
walk.dispose()
}
}
}