github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-22 14:34:54 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

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

New Issue
Closed
opened 2025-11-02 09:24:26 -06:00 by GiteaMirror · 3 comments
GiteaMirror commented 2025-11-02 09:24:26 -06:00
Owner
Copy Link

Originally created by @jim-kirisame on GitHub (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

Originally created by @jim-kirisame on GitHub (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](xxx)) from BRANCH into main" I have reproduce the bug in try.gitea.io. This is the link: - [branch after merge with rebase mode](https://try.gitea.io/jim1399/test-pr-repo/commits/branch/main) - [branch to be merge](https://try.gitea.io/jim1399/test-pr-repo/commits/branch/jim1399-patch-1) The HEAD of PR branch is [30a8edb4](https://try.gitea.io/jim1399/test-pr-repo/commit/30a8edb4539e9d9b0f3d6436f62d37656a1330d9) but in main branch is [29420402](https://try.gitea.io/jim1399/test-pr-repo/commit/29420402d2a0bd8b83161c26426b22ebde3f878e), 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
GiteaMirror added the issue/confirmedtype/bug labels 2025-11-02 09:24:26 -06:00
GiteaMirror commented 2025-11-02 09:24:27 -06:00
Author
Owner
Copy Link

@eremenko789 commented on GitHub (Jun 30, 2023):

Still relevant for 1.20.0-rc2

@eremenko789 commented on GitHub (Jun 30, 2023): Still relevant for 1.20.0-rc2
GiteaMirror commented 2025-11-02 09:24:28 -06:00
Author
Owner
Copy Link

@mmithril commented on GitHub (Jul 3, 2023):

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

Please fix as soon as possible anyway.

@mmithril commented on GitHub (Jul 3, 2023): Possible workaround: use _Squash commit_ & edit the message manually. Please fix as soon as possible anyway.
GiteaMirror commented 2025-11-02 09:24:28 -06:00
Author
Owner
Copy Link

@wxiaoguang commented on GitHub (Jul 9, 2023):

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

@wxiaoguang commented on GitHub (Jul 9, 2023): -> Avoid amending the Rebase and Fast-forward merge if there is no message template #25779
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label issue/confirmed type/bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#10999
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?