Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve sync fork behavior (#33319) #33332

Merged
merged 2 commits into from
Jan 20, 2025
Merged

Improve sync fork behavior (#33319) #33332

merged 2 commits into from
Jan 20, 2025

Conversation

wxiaoguang
Copy link
Contributor

Backport #33319
Fix #33271

The only conflict is reqctx in services/repository/merge_upstream.go, which could keep using context.Context in 1.23

@wxiaoguang
Improve sync fork behavior (go-gitea#33319)
db9fe86 
Fix go-gitea#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`
# Conflicts:
#	services/repository/merge_upstream.go
@GiteaBot GiteaBot added this to the 1.23.2 milestone Jan 20, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 20, 2025
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 20, 2025
@github-actions github-actions bot added modifies/translation modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Jan 20, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 20, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 20, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 20, 2025
@lunny lunny enabled auto-merge (squash) January 20, 2025 07:37
@lunny lunny merged commit 8f45a11 into go-gitea:release/v1.23 Jan 20, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 20, 2025
@wxiaoguang wxiaoguang deleted the backport-sync-fork branch January 20, 2025 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zettat123 Zettat123 Zettat123 approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files modifies/translation size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
1.23.2
Development

Successfully merging this pull request may close these issues.
4 participants
@wxiaoguang @lunny @Zettat123 @GiteaBot