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

(refs #2)Add NO_FF option to merging pull request.

Browse Source
This commit is contained in:
takezoe
2013-07-29 02:10:21 +09:00
parent f317d74bb4
commit 7a8958741d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/app/PullRequestsController.scala
View File

@@ -11,6 +11,8 @@ import org.eclipse.jgit.transport.RefSpec
import org.apache.commons.io.FileUtils
import scala.collection.JavaConverters._
import service.RepositoryService.RepositoryTreeNode
import org.eclipse.jgit.lib.PersonIdent
import org.eclipse.jgit.api.MergeCommand.FastForwardMode
class PullRequestsController extends PullRequestsControllerBase
with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with ActivityService
@@ -108,17 +110,18 @@ trait PullRequestsControllerBase extends ControllerBase {
val result = git.merge
.include(git.getRepository.resolve("FETCH_HEAD"))
.setCommit(false).call
.setFastForward(FastForwardMode.NO_FF)
.setCommit(true).call
if(result.getConflicts != null){
throw new RuntimeException("This pull request can't merge automatically.")
}
// TODO merge commit
// git.commit
// .setCommitter(new PersonIdent(loginAccount.userName, loginAccount.mailAddress))
// .setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n"
// + form.message).call
// git.commit
// .setCommitter(new PersonIdent(loginAccount.userName, loginAccount.mailAddress))
// .setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n"
// + form.message).call
git.push.call
val (commits, _) = getRequestCompareInfo(repository.owner, repository.name, pullreq.commitIdFrom,