Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-10 09:32:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1838) Fix rebase merge

Browse Source
This commit is contained in:
Naoki Takezoe
2018-01-11 15:58:02 +09:00
parent 8e8e794574
commit a045fc6ae4
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/scala/gitbucket/core/service/MergeService.scala
View File

@@ -4,7 +4,7 @@ import gitbucket.core.model.Account
import gitbucket.core.util.Directory._
import gitbucket.core.util.SyntaxSugars._
import org.eclipse.jgit.merge.{MergeStrategy, Merger, RecursiveMerger}
import org.eclipse.jgit.api.{Git, MergeResult}
import org.eclipse.jgit.api.Git
import org.eclipse.jgit.transport.RefSpec
import org.eclipse.jgit.errors.NoMergeBaseException
import org.eclipse.jgit.lib.{CommitBuilder, ObjectId, PersonIdent, Repository}
@@ -211,7 +211,7 @@ object MergeService{
}
// update branch from cache
def merge(message:String, committer:PersonIdent) = {
def merge(message: String, committer: PersonIdent) = {
if(checkConflict().isDefined){
throw new RuntimeException("This pull request can't merge automatically.")
}
@@ -229,12 +229,13 @@ object MergeService{
throw new RuntimeException("This pull request can't merge automatically.")
}
def _cloneCommit(commit: RevCommit, parents: Array[ObjectId]): CommitBuilder = {
def _cloneCommit(commit: RevCommit, parentId: ObjectId, baseId: ObjectId): CommitBuilder = {
val merger = MergeStrategy.RECURSIVE.newMerger(repository, true)
merger.merge(commit.toObjectId, baseId)
val newCommit = new CommitBuilder()
newCommit.setTreeId(commit.getTree.getId)
parents.foreach { parentId =>
newCommit.addParentId(parentId)
}
newCommit.setTreeId(merger.getResultTreeId)
newCommit.addParentId(parentId)
newCommit.setAuthor(commit.getAuthorIdent)
newCommit.setCommitter(committer)
newCommit.setMessage(commit.getFullMessage)
@@ -246,7 +247,7 @@ object MergeService{
using(repository.newObjectInserter){ inserter =>
commits.foreach { commit =>
val nextCommit = _cloneCommit(commit, Array(previousId))
val nextCommit = _cloneCommit(commit, previousId, mergeBaseTipCommit.getId)
previousId = inserter.insert(nextCommit)
}
inserter.flush()