Skip to content

Commit

Permalink
Don't error when branch's commit doesn't exist (#19547)
Browse files Browse the repository at this point in the history
* 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 #19541

* Don't send empty objects

* Use more minimal approach
  • Loading branch information
Gusted authored Apr 29, 2022
1 parent 53829b8 commit 334707f
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions routers/api/v1/repo/branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,15 @@ func ListBranches(ctx *context.APIContext) {
return
}

apiBranches := make([]*api.Branch, len(branches))
apiBranches := make([]*api.Branch, 0, len(branches))
for i := range branches {
c, err := branches[i].GetCommit()
if err != nil {
// Skip if this branch doesn't exist anymore.
if git.IsErrNotExist(err) {
totalNumOfBranches--
continue
}
ctx.Error(http.StatusInternalServerError, "GetCommit", err)
return
}
Expand All @@ -271,11 +276,12 @@ func ListBranches(ctx *context.APIContext) {
ctx.Error(http.StatusInternalServerError, "GetBranchProtection", err)
return
}
apiBranches[i], err = convert.ToBranch(ctx.Repo.Repository, branches[i], c, branchProtection, ctx.Doer, ctx.Repo.IsAdmin())
apiBranch, err := convert.ToBranch(ctx.Repo.Repository, branches[i], c, branchProtection, ctx.Doer, ctx.Repo.IsAdmin())
if err != nil {
ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err)
return
}
apiBranches = append(apiBranches, apiBranch)
}

ctx.SetLinkHeader(totalNumOfBranches, listOptions.PageSize)
Expand Down

0 comments on commit 334707f

Please sign in to comment.