references/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-06-14 03:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

add fixme comment

Browse Source
This commit is contained in:
wxiaoguang
2026-05-31 19:25:43 +08:00
parent 9392da4d64
commit da91800c1b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/pull/pull.go
+3 -2
View File
@@ -840,11 +840,13 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ
message := strings.TrimSpace(pr.Issue.Content) message := strings.TrimSpace(pr.Issue.Content)
messageHasTrailers := commitMessageTrailersPattern.MatchString(message) messageHasTrailers := commitMessageTrailersPattern.MatchString(message)
stringBuilder.WriteString(message) stringBuilder.WriteString(message)
// FIXME: is it right? why `len(commits)-1)`?
additionalCommitMessages := formatSquashMergeCommitMessages(commits[:max(0, len(commits)-1)]) additionalCommitMessages := formatSquashMergeCommitMessages(commits[:max(0, len(commits)-1)])
if additionalCommitMessages != "" { if additionalCommitMessages != "" {
if stringBuilder.Len() > 0 { if stringBuilder.Len() > 0 {
stringBuilder.WriteString("\n\n") stringBuilder.WriteString("\n\n")
} }
// FIXME: is it right? what if `pr.Issue.Content` contains trailers?
stringBuilder.WriteString(additionalCommitMessages) stringBuilder.WriteString(additionalCommitMessages)
// appended bullets push the PR-description trailers (if any) out of the trailer-block position // appended bullets push the PR-description trailers (if any) out of the trailer-block position
} else if stringBuilder.Len() > 0 { } else if stringBuilder.Len() > 0 {
@@ -930,8 +932,7 @@ func formatSquashMergeCommitMessages(commits []*git.Commit) string {
} }
} }
buf := sb.Bytes() buf := bytes.TrimSpace(sb.Bytes())
buf = bytes.TrimSpace(buf)
if maxMsgSize > 0 && len(buf) > maxMsgSize { if maxMsgSize > 0 && len(buf) > maxMsgSize {
buf = buf[:maxMsgSize] buf = buf[:maxMsgSize]
for { for {