Backport #25779 by @wxiaoguang Related #22669. Close #25177 After the fix: ![image](https://github.com/go-gitea/gitea/assets/2114189/0e900927-ea72-4f8f-bde6-5ed927cb02f4) Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>tags/v1.20.0
@@ -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" |
@@ -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 |