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.

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

Restore deleted branches when syncing #29898

Merged
merged 6 commits into from Mar 20, 2024

Conversation

wolfogre
Copy link
Member

@wolfogre wolfogre commented Mar 19, 2024

Regression of #29493. If a branch has been deleted, repushing it won't restore it.

Lunny may have noticed that, but I didn't delve into the comment then overlooked it: #29493 (comment)

The additional comments added are to explain the issue I found during testing, which are unrelated to the fixes.

@wolfogre wolfogre added this to the 1.22.0 milestone Mar 19, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 19, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 19, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Mar 19, 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 Mar 19, 2024
@lunny lunny added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Mar 19, 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 Mar 20, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 20, 2024
@lunny lunny enabled auto-merge (squash) March 20, 2024 01:19
@lunny lunny merged commit f371f84 into go-gitea:main Mar 20, 2024
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 Mar 20, 2024
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 20, 2024
* origin/main:
  Fix loadOneBranch panic (go-gitea#29938)
  Fix comment review avatar alignment (go-gitea#29935)
  Remove the negative margin from `.page-content` (go-gitea#29922)
  Move notifications to a standalone file (go-gitea#29930)
  Remove unnecessary ".Link" usages (go-gitea#29929)
  Remove unnecessary ".Link" usages (go-gitea#29909)
  Show Actions post step when it's running (go-gitea#29926)
  Fix the wrong default value of ENABLE_OPENID_SIGNIN on docs (go-gitea#29925)
  Restore deleted branches when syncing (go-gitea#29898)
  Don't lock using GitHub actions (go-gitea#29913)
  Remove jQuery `.attr` from the user search box (go-gitea#29919)
  Remove jQuery `.attr` from the archive download and compare page branch selector (go-gitea#29918)
  Remove jQuery `.attr` from the image diff (go-gitea#29917)
  Remove jQuery `.attr` from the quick pull request button text (go-gitea#29916)
  Remove jQuery `.attr` from the issue author dropdown (go-gitea#29915)
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 20, 2024
* origin/main:
  Fix loadOneBranch panic (go-gitea#29938)
  Fix comment review avatar alignment (go-gitea#29935)
  Remove the negative margin from `.page-content` (go-gitea#29922)
  Move notifications to a standalone file (go-gitea#29930)
  Remove unnecessary ".Link" usages (go-gitea#29929)
  Remove unnecessary ".Link" usages (go-gitea#29909)
  Show Actions post step when it's running (go-gitea#29926)
  Fix the wrong default value of ENABLE_OPENID_SIGNIN on docs (go-gitea#29925)
  Restore deleted branches when syncing (go-gitea#29898)
  Don't lock using GitHub actions (go-gitea#29913)
  Remove jQuery `.attr` from the user search box (go-gitea#29919)
  Remove jQuery `.attr` from the archive download and compare page branch selector (go-gitea#29918)
  Remove jQuery `.attr` from the image diff (go-gitea#29917)
  Remove jQuery `.attr` from the quick pull request button text (go-gitea#29916)
  Remove jQuery `.attr` from the issue author dropdown (go-gitea#29915)
  Switch to the maintained vitest extension (go-gitea#29914)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants