Fix push multiple branches error with tests #31151
Merged
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/M
wolfogre
approved these changes
May 29, 2024
GiteaBot
added
lgtm/need 1
wxiaoguang
approved these changes
May 29, 2024
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
yp05327
approved these changes
May 29, 2024
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
May 29, 2024
GiteaBot
added
backport/done
lunny
added a commit
that referenced
this pull request
May 30, 2024
Backport #31151 by @lunny Fix #31140 The previous logic is wrong when pushing multiple branches. After first branch updated, it will ignore left other branches sync operations. As a workaround for the repositories, just push a new commit after the patch applied will fix the repositories status. Co-authored-by: Lunny Xiao <[email protected]>
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
May 30, 2024
* giteaofficial/main: (30 commits) Azure blob storage support (go-gitea#30995) Use repo as of renderctx's member rather than a repoPath on metas (go-gitea#29222) Ignore FindRecentlyPushedNewBranches err (go-gitea#31164) [skip ci] Updated translations via Crowdin Fix markup preview (go-gitea#31158) Swap word order in Comment and Close (go-gitea#31148) Fix push multiple branches error with tests (go-gitea#31151) Use vertical layout for multiple code expander buttons (go-gitea#31122) Remove duplicate `ProxyPreserveHost` in Apache httpd doc (go-gitea#31143) [skip ci] Updated translations via Crowdin Add an immutable tarball link to archive download headers for Nix (go-gitea#31139) Improve mobile review ui (go-gitea#31091) Add topics for repository API (go-gitea#31127) Add missed return after `ctx.ServerError` (go-gitea#31130) Fix API repository object format missed (go-gitea#31118) Fix DashboardRepoList margin (go-gitea#31121) Update JS dependencies (go-gitea#31120) [skip ci] Updated translations via Crowdin Prevent simultaneous editing of comments and issues (go-gitea#31053) Update demo site location from try.gitea.io -> demo.gitea.com (go-gitea#31054) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 #31140
The previous logic is wrong when pushing multiple branches. After first branch updated, it will ignore left other branches sync operations.
As a workaround for the repositories, just push a new commit after the patch applied will fix the repositories status.