Rebase and Fast-forward for Pull-Request is not working properly

[jim-kirisame]

Description

Hi, I'm notice the "Rebase and Fast forward" mode for Pull Requst is not work properly in 1.20.0-rc0. It will modify the last commit of the PR and rewrite the message of commit to "Merge pull request 'xxx' (#1) from BRANCH into main"

I have reproduce the bug in try.gitea.io. This is the link:

• branch after merge with rebase mode
• branch to be merge

The HEAD of PR branch is 30a8edb4 but in main branch is 29420402, which is not correct in Rebase and Fast-forward mode.

Gitea Version

1.20.0-rc0, or 1.20.0+rc0-17-g81211db07

Can you reproduce the bug on the Gitea demo site?

Yes

Log Gist

No response

Screenshots

No response

Git Version

No response

Operating System

No response

How are you running Gitea?

https://try.gitea.io/

Database

None

[eremenko789]

Still relevant for 1.20.0-rc2

[mmithril]

Possible workaround: use Squash commit & edit the message manually.

Please fix as soon as possible anyway.

[wxiaoguang]

-> Avoid amending the Rebase and Fast-forward merge if there is no message template #25779