Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 22:15:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed updating temporary files for branches.

Browse Source
This commit is contained in:
takezoe
2013-04-12 03:23:10 +09:00
parent 0d68578a27
commit 319f301b03
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/app/RepositoryViewerServlet.scala
View File

@@ -133,18 +133,20 @@ class RepositoryViewerServlet extends ScalatraServlet with ServletBase {
val git = Git.open(dir) val git = Git.open(dir)
val branchList = git.branchList.call.toArray.map { ref => val branchList = git.branchList.call.toArray.map { ref =>
ref.asInstanceOf[Ref].getName.replaceFirst("^refs/heads/", "") ref.asInstanceOf[Ref].getName
}.toList }.toList
branchList.foreach { branch => branchList.foreach { branch =>
val branchdir = getBranchDir(owner, repository, branch) val branchName = branch.replaceFirst("^refs/heads/", "")
val branchdir = getBranchDir(owner, repository, branchName)
if(!branchdir.exists){ if(!branchdir.exists){
branchdir.mkdirs() branchdir.mkdirs()
Git.cloneRepository Git.cloneRepository
.setURI(dir.toURL.toString) .setURI(dir.toURL.toString)
.setBranch(branch)
.setDirectory(branchdir) .setDirectory(branchdir)
.call .call
Git.open(branchdir).checkout.setName(branch).call Git.open(branchdir).checkout.setName(branchName).call
} else { } else {
Git.open(branchdir).pull.call Git.open(branchdir).pull.call
} }