thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

services: in loadOneBranch, return if CountDivergingCommits fail

Browse source 
If we can't count the number of diverging commits for one reason or
another (such as the branch being in the database, but missing from
disk), rather than logging an error and continuing into a crash (because
`divergence` will be nil), return an error instead.

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
This commit is contained in:
Gergely Nagy 2024-01-13 21:02:49 +01:00
parent 06d419d3ff
commit 8266105f24
No known key found for this signature in database
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/repository/branch.go
View file

@ -131,7 +131,7 @@ func loadOneBranch(ctx context.Context, repo *repo_model.Repository, dbBranch *g
var err error var err error
divergence, err = files_service.CountDivergingCommits(ctx, repo, git.BranchPrefix+branchName) divergence, err = files_service.CountDivergingCommits(ctx, repo, git.BranchPrefix+branchName)
if err != nil { if err != nil {
log.Error("CountDivergingCommits: %v", err) return nil, fmt.Errorf("CountDivergingCommits: %v", err)
} }
} }