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

Don't error when branch's commit doesn't exist #19547

Merged
merged 3 commits into from
Apr 29, 2022

Conversation

Gusted
Copy link
Contributor

@Gusted Gusted commented Apr 29, 2022

- If one of the branches no longer exists, don't throw an error, it's possible that the branch was destroyed during the process. Simply skip it and disregard it.
- Resolves go-gitea#19541
@Gusted Gusted added this to the 1.17.0 milestone Apr 29, 2022
@Gusted Gusted added type/bug modifies/api This PR adds API routes or modifies them labels Apr 29, 2022
routers/api/v1/repo/branch.go Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 29, 2022
@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 Apr 29, 2022
Gusted pushed a commit to Gusted/gitea that referenced this pull request Apr 29, 2022
- Backport go-gitea#19547
  - If one of the branches no longer exists, don't throw an error, it's possible that the branch was destroyed during the process. Simply skip it and disregard it.
  - Resolves go-gitea#19541
@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 Apr 29, 2022
@lunny lunny merged commit 334707f into go-gitea:main Apr 29, 2022
6543 pushed a commit that referenced this pull request Apr 29, 2022
- Backport #19547
  - If one of the branches no longer exists, don't throw an error, it's possible that the branch was destroyed during the process. Simply skip it and disregard it.
  - Resolves #19541
@6543 6543 added the backport/done All backports for this PR have been created label Apr 30, 2022
Gusted pushed a commit to Gusted/gitea that referenced this pull request Apr 30, 2022
* Don't error when branch's commit doesn't exist

- If one of the branches no longer exists, don't throw an error, it's possible that the branch was destroyed during the process. Simply skip it and disregard it.
- Resolves go-gitea#19541

* Don't send empty objects

* Use more minimal approach
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 1, 2022
* giteaofficial/main:
  Avoid MoreThanOne Error (go-gitea#19557)
  [skip ci] Updated licenses and gitignores
  Simplify loops to copy (go-gitea#19569)
  Use middleware to open gitRepo (go-gitea#19559)
  Added X-Mailer header to outgoing emails (go-gitea#19562)
  fix go-gitea#19545 (go-gitea#19563)
  [skip ci] Updated translations via Crowdin
  Respect DefaultUserIsRestricted system default when creating new user (go-gitea#19310)
  Mute link in diff header (go-gitea#19556)
  Add API to query collaborators permission for a repository (go-gitea#18761)
  Permalink files In PR diff (go-gitea#19534)
  Fix Pull Request comment filename word breaks (go-gitea#19535)
  Don't error when branch's commit doesn't exist (go-gitea#19547)
@Gusted Gusted deleted the fault-tolerance-list-branches branch May 9, 2022 05:34
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this pull request Aug 24, 2022
* Don't error when branch's commit doesn't exist

- If one of the branches no longer exists, don't throw an error, it's possible that the branch was destroyed during the process. Simply skip it and disregard it.
- Resolves go-gitea#19541

* Don't send empty objects

* Use more minimal approach
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

/api/v1/repos/${org}/${repo}/branches fails with HTTP 500 when branch is being deleted
4 participants