fix comment

Author: wxiaoguang

services/pull/pull.go

@@ -838,19 +838,20 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ
 	stringBuilder := strings.Builder{}
 
 	if !setting.Repository.PullRequest.PopulateSquashCommentWithCommitMessages {
-		//use PR's title and description as squash commit message
+		// use PR's title and description as squash commit message
 		message := strings.TrimSpace(pr.Issue.Content)
 		stringBuilder.WriteString(message)
 		if stringBuilder.Len() > 0 {
 			stringBuilder.WriteRune('\n')
 			if !commitMessageTrailersPattern.MatchString(message) {
+				// TODO: this trailer check doesn't work with the separator line added below for the co-authors
 				stringBuilder.WriteRune('\n')
 			}
 		}
 	} else {
 		// use PR's commit messages as squash commit message
 		// commits list is in reverse chronological order
-		maxSize := setting.Repository.PullRequest.DefaultMergeMessageSize
+		maxMsgSize := setting.Repository.PullRequest.DefaultMergeMessageSize
 		for i := len(commits) - 1; i >= 0; i-- {
 			commit := commits[i]
 			msg := strings.TrimSpace(commit.CommitMessage)
@@ -859,8 +860,8 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ
 			}
 
 			_, _ = fmt.Fprintf(&stringBuilder, "* %s\n\n", msg)
-			if maxSize > 0 && stringBuilder.Len() >= maxSize {
-				tmp := strings.ToValidUTF8(stringBuilder.String()[:maxSize]+"...", "?")
+			if maxMsgSize > 0 && stringBuilder.Len() >= maxMsgSize {
+				tmp := strings.ToValidUTF8(stringBuilder.String()[:maxMsgSize]+"...", "?")
 				stringBuilder.Reset()
 				stringBuilder.WriteString(tmp)
 				break
@@ -908,6 +909,7 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ
 	}
 
 	if stringBuilder.Len() > 0 && len(authors) > 0 {
+		// TODO: this separator line doesn't work with the trailer check (commitMessageTrailersPattern) above
 		stringBuilder.WriteString("---------\n\n")
 	}
 

tests/integration/pull_merge_test.go

@@ -42,6 +42,7 @@ import (
 	files_service "code.gitea.io/gitea/services/repository/files"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type MergeOptions struct {
@@ -1197,7 +1198,7 @@ func TestPullSquashMessage(t *testing.T) {
 			Readme:        "Default",
 			DefaultBranch: "main",
 		})
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		type commitInfo struct {
 			userName      string
@@ -1309,9 +1310,9 @@ Co-authored-by: user4 <[email protected]>
 					Title:         "Pull for " + branchName,
 				})
 				elems := strings.Split(test.RedirectURL(resp), "/")
-				pullIndex, err := strconv.Atoi(elems[4])
+				pullIndex, err := strconv.ParseInt(elems[4], 10, 64)
 				assert.NoError(t, err)
-				pullRequest := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, Index: int64(pullIndex)})
+				pullRequest := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, Index: pullIndex})
 				squashMergeCommitMessage := pull_service.GetSquashMergeCommitMessages(t.Context(), pullRequest)
 				assert.Equal(t, tc.expectedMessage, squashMergeCommitMessage)
 			})