Skip to content

Conversation

@GiteaBot
Copy link
Collaborator

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.

@GiteaBot GiteaBot added modifies/go Pull requests that update Go code type/bug labels May 29, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 29, 2024
@GiteaBot GiteaBot added this to the 1.22.1 milestone May 29, 2024
@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 May 29, 2024
@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 May 29, 2024
@lunny lunny enabled auto-merge (squash) May 30, 2024 06:36
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 30, 2024
@GiteaBot
Copy link
Collaborator Author

@GiteaBot please fix the merge conflicts. 🍵

@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 30, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 30, 2024
@lunny lunny merged commit e8c776c into go-gitea:release/v1.22 May 30, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 30, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

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 type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants