Rebase and Fast-forward for Pull-Request is not working properly #25177
Labels
issue/confirmed
Issue has been reviewed and confirmed to be present or accepted to be implemented
type/bug
Milestone
Comments
jim-kirisame
changed the title
|
Still relevant for 1.20.0-rc2 |
|
Possible workaround: use Squash commit & edit the message manually. Please fix as soon as possible anyway. |
wxiaoguang
added
the
issue/confirmed
This was referenced Jul 9, 2023
|
-> Avoid amending the Rebase and Fast-forward merge if there is no message template #25779 |
silverwind
pushed a commit
that referenced
this issue
Jul 10, 2023
…ge template (#25779) Related #22669. Close #25177 After the fix:  Co-authored-by: Giteabot <[email protected]>
GiteaBot
added a commit
to GiteaBot/gitea
that referenced
this issue
Jul 10, 2023
…ge template (go-gitea#25779) Related go-gitea#22669. Close go-gitea#25177 After the fix:  Co-authored-by: Giteabot <[email protected]>
silverwind
pushed a commit
that referenced
this issue
Jul 10, 2023
…ge template (#25779) (#25809) Backport #25779 by @wxiaoguang Related #22669. Close #25177 After the fix:  Co-authored-by: wxiaoguang <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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:
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
The text was updated successfully, but these errors were encountered: