Skip to content
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
Closed

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

jim-kirisame opened this issue Jun 9, 2023 · 3 comments · Fixed by #25779
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented type/bug
Milestone
1.20.0

Comments

@jim-kirisame
Copy link
Contributor

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 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 Jun 9, 2023
@eremenko789
Copy link

Still relevant for 1.20.0-rc2

@mmithril
Copy link

mmithril commented Jul 3, 2023

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

Please fix as soon as possible anyway.

@wxiaoguang wxiaoguang added this to the 1.20.0 milestone Jul 3, 2023
@wxiaoguang wxiaoguang added the issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented label Jul 3, 2023
This was referenced Jul 9, 2023
Merged
Merged
@wxiaoguang
Copy link
Contributor

-> 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
@wxiaoguang @GiteaBot
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 <teabot@gitea.io>
@GiteaBot GiteaBot mentioned this issue Jul 10, 2023
Merged
GiteaBot added a commit to GiteaBot/gitea that referenced this issue Jul 10, 2023
@wxiaoguang @GiteaBot
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 <teabot@gitea.io>
silverwind pushed a commit that referenced this issue Jul 10, 2023
@GiteaBot @wxiaoguang
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 <wxiaoguang@gmail.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented type/bug
Projects
None yet
Milestone
1.20.0
Development

Successfully merging a pull request may close this issue.

Avoid amending the Rebase and Fast-forward merge if there is no message template wxiaoguang/gitea
4 participants
@wxiaoguang @jim-kirisame @mmithril @eremenko789