gitea

Commit Graph

Author	SHA1	Message	Date
Dan Čermák	b8c9a0c323	Add ff_only parameter to POST /repos/{owner}/{repo}/merge-upstream (#34770 ) 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.	2025-06-19 12:29:10 -07:00
wxiaoguang	39de2955fd	Improve sync fork behavior (#33319 ) Fix #33271 Suppose there is a `branch-a` in fork repo: 1. if `branch-a` exists in base repo: try to sync `base:branch-a` to `fork:branch-a` 2. if `branch-a` doesn't exist in base repo: try to sync `base:main` to `fork:branch-a`	2025-01-20 15:17:47 +08:00
Chai-Shi	e5f3c16587	Fix sync fork for consistency (#33147 ) Fixes #33145 An integration test could be added. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>	2025-01-10 05:29:55 +00:00

Author

SHA1

Message

Date

Dan Čermák

b8c9a0c323

Add ff_only parameter to POST /repos/{owner}/{repo}/merge-upstream (#34770 )

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.

2025-06-19 12:29:10 -07:00

wxiaoguang

39de2955fd

Improve sync fork behavior (#33319 )

Fix #33271

Suppose there is a `branch-a` in fork repo:

1. if `branch-a` exists in base repo: try to sync `base:branch-a` to `fork:branch-a`
2. if `branch-a` doesn't exist in base repo: try to sync `base:main` to `fork:branch-a`

2025-01-20 15:17:47 +08:00

Chai-Shi

e5f3c16587

Fix sync fork for consistency (#33147 )

Fixes #33145

An integration test could be added.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

2025-01-10 05:29:55 +00:00

3 Commits (6596b921409f0763f08e2cc2c1e466929a80be28)