Add ff_only parameter to POST /repos/{owner}/{repo}/merge-upstream #34770
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
github-actions
bot
added
modifies/api
dcermak
force-pushed
the
allow-ff-only-fork-updates
branch
from
f5bc44e to
3863727
Compare
wxiaoguang
reviewed
Jun 19, 2025
dcermak
force-pushed
the
allow-ff-only-fork-updates
branch
2 times, most recently
from
52d3777 to
7b9e4d8
Compare
wxiaoguang
reviewed
Jun 19, 2025
dcermak
force-pushed
the
allow-ff-only-fork-updates
branch
from
7b9e4d8 to
b422cdf
Compare
The merge-upstream route was so far performing any kind of merge, even those that would create merge commits and thus make your branch diverge from upstream, requiring manual intervention via the git cli to undo the damage. With the new optional parameter ff_only, we can instruct gitea to error out, if a non-fast-forward merge would be performed.
wxiaoguang
approved these changes
Jun 19, 2025
GiteaBot
added
lgtm/need 1
lunny
approved these changes
Jun 19, 2025
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Jun 20, 2025
* giteaofficial/main:
[skip ci] Updated translations via Crowdin
Add ff_only parameter to POST /repos/{owner}/{repo}/merge-upstream (go-gitea#34770)
Add repo file tree item link behavior (go-gitea#34730)
Fix tag target (go-gitea#34781)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The merge-upstream route was so far performing any kind of merge, even those that would create merge commits and thus make your branch diverge from upstream, requiring manual intervention via the git cli to undo the damage.
With the new optional parameter ff_only, we can instruct gitea to error out, if a non-fast-forward merge would be performed.