mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-11 16:05:49 +01:00
Fix compilation error caused by JGit update
This commit is contained in:
@@ -683,7 +683,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
|
|||||||
headName, loginAccount.fullName, loginAccount.mailAddress, message)
|
headName, loginAccount.fullName, loginAccount.mailAddress, message)
|
||||||
|
|
||||||
inserter.flush()
|
inserter.flush()
|
||||||
inserter.release()
|
inserter.close()
|
||||||
|
|
||||||
// update refs
|
// update refs
|
||||||
val refUpdate = git.getRepository.updateRef(headName)
|
val refUpdate = git.getRepository.updateRef(headName)
|
||||||
|
|||||||
@@ -169,7 +169,7 @@ object PluginRegistry {
|
|||||||
))
|
))
|
||||||
|
|
||||||
} catch {
|
} catch {
|
||||||
case e: Exception => {
|
case e: Throwable => {
|
||||||
logger.error(s"Error during plugin initialization", e)
|
logger.error(s"Error during plugin initialization", e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ object MergeService{
|
|||||||
val inserter = repository.newObjectInserter
|
val inserter = repository.newObjectInserter
|
||||||
val mergeCommitId = inserter.insert(mergeCommit)
|
val mergeCommitId = inserter.insert(mergeCommit)
|
||||||
inserter.flush()
|
inserter.flush()
|
||||||
inserter.release()
|
inserter.close()
|
||||||
mergeCommitId
|
mergeCommitId
|
||||||
}
|
}
|
||||||
private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))
|
private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))
|
||||||
|
|||||||
@@ -79,8 +79,8 @@ trait RepositorySearchService { self: IssuesService =>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
treeWalk.release
|
treeWalk.close()
|
||||||
revWalk.release
|
revWalk.close()
|
||||||
|
|
||||||
list.toList
|
list.toList
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package gitbucket.core.util
|
package gitbucket.core.util
|
||||||
|
|
||||||
import org.eclipse.jgit.api.Git
|
import org.eclipse.jgit.api.Git
|
||||||
import org.eclipse.jgit.revwalk.RevWalk
|
|
||||||
import org.eclipse.jgit.treewalk.TreeWalk
|
|
||||||
import scala.util.control.Exception._
|
import scala.util.control.Exception._
|
||||||
import scala.language.reflectiveCalls
|
import scala.language.reflectiveCalls
|
||||||
|
|
||||||
@@ -31,12 +29,6 @@ object ControlUtil {
|
|||||||
git2.getRepository.close()
|
git2.getRepository.close()
|
||||||
}
|
}
|
||||||
|
|
||||||
def using[T](revWalk: RevWalk)(f: RevWalk => T): T =
|
|
||||||
try f(revWalk) finally revWalk.release()
|
|
||||||
|
|
||||||
def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
|
|
||||||
try f(treeWalk) finally treeWalk.release()
|
|
||||||
|
|
||||||
def ignore[T](f: => Unit): Unit = try {
|
def ignore[T](f: => Unit): Unit = try {
|
||||||
f
|
f
|
||||||
} catch {
|
} catch {
|
||||||
|
|||||||
@@ -688,7 +688,7 @@ object JGitUtil {
|
|||||||
|
|
||||||
val newHeadId = inserter.insert(newCommit)
|
val newHeadId = inserter.insert(newCommit)
|
||||||
inserter.flush()
|
inserter.flush()
|
||||||
inserter.release()
|
inserter.close()
|
||||||
|
|
||||||
val refUpdate = git.getRepository.updateRef(ref)
|
val refUpdate = git.getRepository.updateRef(ref)
|
||||||
refUpdate.setNewObjectId(newHeadId)
|
refUpdate.setNewObjectId(newHeadId)
|
||||||
|
|||||||
Reference in New Issue
Block a user