fix

wxiaoguang · wxiaoguang · commit 669cccd0a807 · 2025-05-26T18:53:22.000+08:00
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
@@ -1109,9 +1109,8 @@ func MergePullRequest(ctx *context.Context) {
 	}
 
 	form.MergeMessageField = strings.TrimSpace(form.MergeMessageField)
-	message += "\n"
 	if len(form.MergeMessageField) > 0 {
-		message += "\n" + form.MergeMessageField
+		message += "\n\n" + form.MergeMessageField
 	}
 
 	if form.MergeWhenChecksSucceed {
diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go
@@ -66,6 +66,9 @@ func doMergeStyleSquash(ctx *mergeContext, message string) error {
 
 	if setting.Repository.PullRequest.AddCoCommitterTrailers && ctx.committer.String() != sig.String() {
 		// add trailer
+		if !strings.HasSuffix(message, "\n") {
+			message += "\n"
+		}
 		if !strings.Contains(message, "Co-authored-by: "+sig.String()) {
 			message += "\nCo-authored-by: " + sig.String()
 		}

Original file line number	Diff line number	Diff line change
`@@ -1109,9 +1109,8 @@ func MergePullRequest(ctx *context.Context) {`
`1109`	`1109`	`}`
`1110`	`1110`
`1111`	`1111`	`form.MergeMessageField = strings.TrimSpace(form.MergeMessageField)`
`1112`		`- message += "\n"`
`1113`	`1112`	`if len(form.MergeMessageField) > 0 {`
`1114`		`- message += "\n" + form.MergeMessageField`
	`1113`	`+ message += "\n\n" + form.MergeMessageField`
`1115`	`1114`	`}`
`1116`	`1115`
`1117`	`1116`	`if form.MergeWhenChecksSucceed {`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ func doMergeStyleSquash(ctx *mergeContext, message string) error {`
`66`	`66`
`67`	`67`	`if setting.Repository.PullRequest.AddCoCommitterTrailers && ctx.committer.String() != sig.String() {`
`68`	`68`	`// add trailer`
	`69`	`+ if !strings.HasSuffix(message, "\n") {`
	`70`	`+ message += "\n"`
	`71`	`+ }`
`69`	`72`	`if !strings.Contains(message, "Co-authored-by: "+sig.String()) {`
`70`	`73`	`message += "\nCo-authored-by: " + sig.String()`
`71`	`74`	`}`