From b6390ac3836147034e2fa80e7d9884b826566a0d Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Thu, 2 Mar 2017 16:31:23 +0900
Subject: [PATCH] (refs #1470)Fix branch indicator

---
 src/main/scala/gitbucket/core/util/JGitUtil.scala | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala
index e26a733fd..e5513744f 100644
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -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()
         }
       }
     }