New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed

jim-kirisame opened this issue Jun 9, 2023 · 3 comments · Fixed by #25779

Labels

issue/confirmed type/bug

Milestone

Contributor

jim-kirisame commented Jun 9, 2023

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

jim-kirisame added the type/bug label

jim-kirisame changed the title ~~Rebase and Fast-forward for Pulll-Request is not working properly~~ Rebase and Fast-forward for Pull-Request is not working properly

eremenko789 commented Jun 30, 2023

Still relevant for 1.20.0-rc2

mmithril commented Jul 3, 2023

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

Please fix as soon as possible anyway.

wxiaoguang added this to the 1.20.0 milestone

wxiaoguang added the issue/confirmed label

This was referenced Jul 9, 2023

Merge message template support for rebase without merge commit #22669

Merged

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

Merged

Contributor

wxiaoguang commented Jul 9, 2023

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

silverwind closed this as completed in #25779

silverwind pushed a commit that referenced this issue


          Avoid amending the Rebase and Fast-forward merge if there is no messa…

d987279

…ge template (#25779)

Related #22669. Close #25177

After the fix:


![image](https://github.com/go-gitea/gitea/assets/2114189/0e900927-ea72-4f8f-bde6-5ed927cb02f4)

Co-authored-by: Giteabot <[email protected]>

GiteaBot mentioned this issue

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

Merged

GiteaBot added a commit to GiteaBot/gitea that referenced this issue


          Avoid amending the Rebase and Fast-forward merge if there is no messa…

5e52cfa

…ge template (go-gitea#25779)

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 <[email protected]>

silverwind pushed a commit that referenced this issue


          Avoid amending the Rebase and Fast-forward merge if there is no messa…

a1bc2aa

…ge template (#25779) (#25809)

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 <[email protected]>

github-actions bot locked as resolved and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.