gitea

Commit Graph

Author	SHA1	Message	Date
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

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

2 Commits (dcd3014567f2b8be3fca01c20c2b3eabdc8f519e)