diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index 75e1dee..970e380 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -436,10 +436,16 @@ * Displays branches. */ get("/:owner/:repository/branches")(referrersOnly { repository => - val branches = JGitUtil.getBranches(repository.owner, repository.name, repository.repository.defaultBranch) - .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime)) - .map(br => br -> getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId)) - .reverse + val branches = JGitUtil.getBranches( + owner = repository.owner, + name = repository.name, + defaultBranch = repository.repository.defaultBranch, + origin = repository.repository.originUserName.isEmpty + ) + .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime)) + .map(br => br -> getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId)) + .reverse + html.branches(branches, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository) }) diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index 01e52c9..3eef33d 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -791,7 +791,7 @@ return git.log.add(startCommit).addPath(path).setMaxCount(1).call.iterator.next } - def getBranches(owner: String, name: String, defaultBranch: String): Seq[BranchInfo] = { + 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)) { @@ -802,20 +802,20 @@ git.branchList.call.asScala.map { ref => val walk = new RevWalk(repo) - try{ + try { val defaultCommit = walk.parseCommit(defaultObject) val branchName = ref.getName.stripPrefix("refs/heads/") val branchCommit = if(branchName == defaultBranch){ defaultCommit - }else{ + } else { walk.parseCommit(ref.getObjectId) } val when = branchCommit.getCommitterIdent.getWhen val committer = branchCommit.getCommitterIdent.getName val committerEmail = branchCommit.getCommitterIdent.getEmailAddress - val mergeInfo = if(branchName==defaultBranch){ + val mergeInfo = if(origin && branchName == defaultBranch){ None - }else{ + } else { walk.reset() walk.setRevFilter( RevFilter.MERGE_BASE ) walk.markStart(branchCommit)