From 7a8958741dcd35b5c6734f9a2e62ad0bc6e022eb Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Mon, 29 Jul 2013 02:10:21 +0900
Subject: [PATCH] (refs #2)Add NO_FF option to merging pull request.

---
 src/main/scala/app/PullRequestsController.scala | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala
index c725962b5..11e6228e7 100644
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -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,