Attempt again...

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

integrations/git_test.go

@@ -442,6 +442,15 @@ func doMergeFork(ctx, baseCtx APITestContext, baseBranch, headBranch string) fun
 		var pr api.PullRequest
 		var err error
 
+		trueBool := true
+		falseBool := false
+
+		t.Run("AllowSetManuallyMergedAndSwitchOffAutodetectManualMerge", doAPIEditRepository(baseCtx, &api.EditRepoOption{
+			HasPullRequests:       &trueBool,
+			AllowManualMerge:      &trueBool,
+			AutodetectManualMerge: &falseBool,
+		}))
+
 		// Create a test pullrequest
 		t.Run("CreatePullRequest", func(t *testing.T) {
 			pr, err = doAPICreatePullRequest(ctx, baseCtx.Username, baseCtx.Reponame, baseBranch, headBranch)(t)
@@ -461,15 +470,6 @@ func doMergeFork(ctx, baseCtx APITestContext, baseBranch, headBranch string) fun
 			diffLength = resp.Length
 		})
 
-		trueBool := true
-		falseBool := false
-
-		t.Run("AllowSetManuallyMergedAndSwitchOffAutodetectManualMerge", doAPIEditRepository(baseCtx, &api.EditRepoOption{
-			HasPullRequests:       &trueBool,
-			AllowManualMerge:      &trueBool,
-			AutodetectManualMerge: &falseBool,
-		}))
-
 		// Now: Merge the PR & make sure that doesn't break the PR page or change its diff
 		t.Run("MergePR", doAPIMergePullRequest(baseCtx, baseCtx.Username, baseCtx.Reponame, pr.Index))
 		t.Run("EnsureCanSeePull", doEnsureCanSeePull(baseCtx, pr))

services/pull/check.go

@@ -180,6 +180,7 @@ func manuallyMerged(pr *models.PullRequest) bool {
 			log.Error("PullRequest[%d].setMerged : %v", pr.ID, err)
 			return false
 		} else if !merged {
+			log.Info("Setting pr #%d in %-v as merged with MergeCommitID %s. Success: %t", pr.Index, pr.BaseRepo, pr.MergedCommitID, merged)
 			return false
 		}
 

services/pull/merge.go

@@ -64,8 +64,10 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
 	pr.Merger = doer
 	pr.MergerID = doer.ID
 
-	if _, err = pr.SetMerged(); err != nil {
+	if success, err := pr.SetMerged(); err != nil {
 		log.Error("setMerged [%d]: %v", pr.ID, err)
+	} else {
+		log.Info("Setting pr #%d in %-v as merged with MergeCommitID %s. Success: %t", pr.Index, pr.BaseRepo, pr.MergedCommitID, success)
 	}
 
 	if err := pr.LoadIssue(); err != nil {
@@ -659,6 +661,7 @@ func MergedManually(pr *models.PullRequest, doer *models.User, baseGitRepo *git.
 	if merged, err = pr.SetMerged(); err != nil {
 		return
 	} else if !merged {
+		log.Info("Setting pr #%d in %-v as merged with MergeCommitID %s. Success: %t", pr.Index, pr.BaseRepo, pr.MergedCommitID, merged)
 		return fmt.Errorf("SetMerged failed")
 	}