Avoid amending the Rebase and Fast-forward merge if there is no message template (go-gitea#25779)

wxiaoguang · GiteaBot · GiteaBot · commit 5e52cfaca991 · 2023-07-10T08:12:55.000Z
Related go-gitea#22669. Close go-gitea#25177 After the fix: ![image](https://github.com/go-gitea/gitea/assets/2114189/0e900927-ea72-4f8f-bde6-5ed927cb02f4) Co-authored-by: Giteabot <teabot@gitea.io>
diff --git a/models/repo/git.go b/models/repo/git.go
@@ -11,7 +11,7 @@ type MergeStyle string
 const (
 	// MergeStyleMerge create merge commit
 	MergeStyleMerge MergeStyle = "merge"
-	// MergeStyleRebase rebase before merging
+	// MergeStyleRebase rebase before merging, and fast-forward
 	MergeStyleRebase MergeStyle = "rebase"
 	// MergeStyleRebaseMerge rebase before merging with merge commit (--no-ff)
 	MergeStyleRebaseMerge MergeStyle = "rebase-merge"
diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -110,6 +110,11 @@ func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issue
 		}
 	}
 
+	if mergeStyle == repo_model.MergeStyleRebase {
+		// for fast-forward rebase, do not amend the last commit if there is no template
+		return "", "", nil
+	}
+
 	// Squash merge has a different from other styles.
 	if mergeStyle == repo_model.MergeStyleSquash {
 		return fmt.Sprintf("%s (%s%d)", pr.Issue.Title, issueReference, pr.Issue.Index), "", nil

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,11 @@ func getMergeMessage(ctx context.Context, baseGitRepo git.Repository, pr issue`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
	`113`	`+ if mergeStyle == repo_model.MergeStyleRebase {`
	`114`	`+ // for fast-forward rebase, do not amend the last commit if there is no template`
	`115`	`+ return "", "", nil`
	`116`	`+ }`
	`117`	`+`
`113`	`118`	`// Squash merge has a different from other styles.`
`114`	`119`	`if mergeStyle == repo_model.MergeStyleSquash {`
`115`	`120`	`return fmt.Sprintf("%s (%s%d)", pr.Issue.Title, issueReference, pr.Issue.Index), "", nil`