gitbucket
diff --git a/‎src/main/scala/gitbucket/core/controller/api/ApiRepositoryBranchControllerBase.scala‎
Lines changed: 3 additions & 12 deletions b/‎src/main/scala/gitbucket/core/controller/api/ApiRepositoryBranchControllerBase.scala‎
Lines changed: 3 additions & 12 deletions
diff --git a/‎src/main/scala/gitbucket/core/controller/api/ApiRepositoryCommitControllerBase.scala‎
Lines changed: 1 addition & 1 deletion b/‎src/main/scala/gitbucket/core/controller/api/ApiRepositoryCommitControllerBase.scala‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/scala/gitbucket/core/service/PullRequestService.scala‎
Lines changed: 1 addition & 1 deletion b/‎src/main/scala/gitbucket/core/service/PullRequestService.scala‎
Lines changed: 1 addition & 1 deletion
@@ -23,10 +23,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
     Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       JsonFormat(
         JGitUtil
-          .getBranchesNoMergeInfo(
-            git = git,
-            defaultBranch = repository.repository.defaultBranch
-          )
+          .getBranchesNoMergeInfo(git)
           .map { br =>
             ApiBranchForList(br.name, ApiBranchCommit(br.commitId))
           }
@@ -42,10 +39,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
     Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       (for {
         branch <- params.get("splat") if repository.branchList.contains(branch)
-        br <- getBranchesNoMergeInfo(
-          git,
-          repository.repository.defaultBranch
-        ).find(_.name == branch)
+        br <- getBranchesNoMergeInfo(git).find(_.name == branch)
       } yield {
         val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
         JsonFormat(
@@ -269,10 +263,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
       (for {
         branch <- params.get("splat") if repository.branchList.contains(branch)
         protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
-        br <- getBranchesNoMergeInfo(
-          git,
-          repository.repository.defaultBranch
-        ).find(_.name == branch)
+        br <- getBranchesNoMergeInfo(git).find(_.name == branch)
       } yield {
         if (protection.enabled) {
           enableBranchProtection(
 
@@ -159,7 +159,7 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
     Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val apiBranchForCommits = for {
         branch <- getBranchesOfCommit(git, sha)
-        br <- getBranchesNoMergeInfo(git, branch).find(_.name == branch)
+        br <- getBranchesNoMergeInfo(git).find(_.name == branch)
       } yield {
         val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
         ApiBranchForHeadCommit(branch, ApiBranchCommit(br.commitId), protection.enabled)
 
@@ -313,7 +313,7 @@ trait PullRequestService {
         base.foreach { _base =>
           if (pr.branch != _base) {
             Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-              getBranchesNoMergeInfo(git, repository.repository.defaultBranch)
+              getBranchesNoMergeInfo(git)
                 .find(_.name == _base)
                 .foreach(br => updateBaseBranch(repository.owner, repository.name, issueId, br.name, br.commitId))
             }
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ trait PullRequestService {`
`313`	`313`	`base.foreach { _base =>`
`314`	`314`	`if (pr.branch != _base) {`
`315`	`315`	`Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>`
`316`		`- getBranchesNoMergeInfo(git, repository.repository.defaultBranch)`
	`316`	`+ getBranchesNoMergeInfo(git)`
`317`	`317`	`.find(_.name == _base)`
`318`	`318`	`.foreach(br => updateBaseBranch(repository.owner, repository.name, issueId, br.name, br.commitId))`
`319`	`319`	`}`