SYNC FORK always only syncs the base repo's default branch

[tkoeferli]

Description

In 1.23.1, the "sync fork" only syncs the base repo's default branch. As in GitHub it should sync the same branch of the forked repo in the base repo as well.

Gitea Version

1.23.1

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?

self hosted.
gitea-1.23.1-linux-amd64

Database

MySQL/MariaDB

[wxiaoguang]

Description

In 1.23.1, the "sync fork" only syncs the base repo's default branch. As in GitHub it should sync the same branch of the forked repo in the base repo as well.

Related:

• Strange behaviors of the Sync Fork feature #33145

@changchaishi

It seems that GitHub also defaults to the "main" (default) branch:

[tkoeferli]

This is not true. If the branch in the forked repo is the same as in the base repo, it will take this. Of course, if you are on a new branch in the fork, it will asume the default in the base.

[wxiaoguang]

This is not true. If the branch in the forked repo is the same as in the base repo, it will take this. Of course, if you are on a new branch in the fork, it will asume the default in the base.

I see, then we need a new logic:

• check the same branch name
• check the default branch name

? It sounds strange. What if the forked branch gets renamed? Does GitHub remember the base branch instead of guessing it?

[tkoeferli]

In this case it will take the default branch in the base repo, as the renamed branch is only in the fork.
This renamed branch will become a new (private) branch in the fork.
I do not see a use case to rename a (forked) branch, it's better to create a new branch. After that, it's up to me to keep my branch in Sync.

[wxiaoguang]

So let me try to summarize the solution: 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

Is it good enough?

[tkoeferli]

Yes I think this okay.
Altough 2. is dangerous and could fail.

Thanks!

[wxiaoguang]

-> Improve sync fork behavior #33319