mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Don't error when branch's commit doesn't exist (#19547)
* 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
This commit is contained in:
		@@ -259,10 +259,15 @@ func ListBranches(ctx *context.APIContext) {
 | 
				
			|||||||
		return
 | 
							return
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	apiBranches := make([]*api.Branch, len(branches))
 | 
						apiBranches := make([]*api.Branch, 0, len(branches))
 | 
				
			||||||
	for i := range branches {
 | 
						for i := range branches {
 | 
				
			||||||
		c, err := branches[i].GetCommit()
 | 
							c, err := branches[i].GetCommit()
 | 
				
			||||||
		if err != nil {
 | 
							if err != nil {
 | 
				
			||||||
 | 
								// Skip if this branch doesn't exist anymore.
 | 
				
			||||||
 | 
								if git.IsErrNotExist(err) {
 | 
				
			||||||
 | 
									totalNumOfBranches--
 | 
				
			||||||
 | 
									continue
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
			ctx.Error(http.StatusInternalServerError, "GetCommit", err)
 | 
								ctx.Error(http.StatusInternalServerError, "GetCommit", err)
 | 
				
			||||||
			return
 | 
								return
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
@@ -271,11 +276,12 @@ func ListBranches(ctx *context.APIContext) {
 | 
				
			|||||||
			ctx.Error(http.StatusInternalServerError, "GetBranchProtection", err)
 | 
								ctx.Error(http.StatusInternalServerError, "GetBranchProtection", err)
 | 
				
			||||||
			return
 | 
								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 {
 | 
							if err != nil {
 | 
				
			||||||
			ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err)
 | 
								ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err)
 | 
				
			||||||
			return
 | 
								return
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
							apiBranches = append(apiBranches, apiBranch)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ctx.SetLinkHeader(totalNumOfBranches, listOptions.PageSize)
 | 
						ctx.SetLinkHeader(totalNumOfBranches, listOptions.PageSize)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user