Improve sync fork behavior #33319
Merged
Improve sync fork behavior #33319
+109
−26
Conversation
This file contains 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
pull-request-size
bot
added
the
size/L
github-actions
bot
added
modifies/translation
modifies/go
wxiaoguang
commented
Jan 18, 2025
wxiaoguang
force-pushed
the
fix-sync-fork
branch
from
1298396 to
ca32157
Compare
|
|
lunny
approved these changes
Jan 18, 2025
GiteaBot
added
lgtm/need 1
lunny
reviewed
Jan 18, 2025
| @@ -167,6 +167,9 @@ func GetBranch(ctx context.Context, repoID int64, branchName string) (*Branch, e | |||
| BranchName: branchName, | |||
| } | |||
| } | |||
| // FIXME: this design is not right: it doesn't check `branch.IsDeleted`, it doesn't make sense to make callers to check IsDeleted again and again. | |||
|
@go-gitea/maintainers ready for review, and need to backport to 1.23 manually |
Zettat123
approved these changes
Jan 20, 2025
GiteaBot
added
lgtm/done
wxiaoguang
added a commit
to wxiaoguang/gitea
that referenced
this pull request
Jan 20, 2025
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
lunny
pushed a commit
that referenced
this pull request
Jan 20, 2025
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Jan 21, 2025
* giteaofficial/main: [skip ci] Updated translations via Crowdin Fix incorrect ref commit ID usage (go-gitea#33331) Improve sync fork behavior (go-gitea#33319) Refactor response writer & access logger (go-gitea#33323)
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.
Fix #33271
Suppose there is a
branch-ain fork repo:branch-aexists in base repo: try to syncbase:branch-atofork:branch-abranch-adoesn't exist in base repo: try to syncbase:maintofork:branch-a