Skip to content

Commit b053be0

Browse files
committed
correct names
1 parent 0fe62db commit b053be0

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

models/git/combined_status.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ func GetLatestCombinedStatusForRepoAndSHAs(ctx context.Context, repoSHAs []RepoS
8282
cond = cond.Or(builder.Eq{"repo_id": rs.RepoID, "sha": rs.SHA})
8383
}
8484

85-
var summaries []*CombinedStatus
86-
if err := db.GetEngine(ctx).Where(cond).Find(&summaries); err != nil {
85+
combinedStatuses := make([]*CombinedStatus, 0, len(repoSHAs))
86+
if err := db.GetEngine(ctx).Where(cond).Find(&combinedStatuses); err != nil {
8787
return nil, err
8888
}
89-
return summaries, nil
89+
return combinedStatuses, nil
9090
}
9191

9292
func InsertOrUpdateCombinedStatus(ctx context.Context, repoID int64, sha string) error {

services/pull/pull.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -998,14 +998,13 @@ func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList
998998
}
999999

10001000
// getAllCommitStatus get pr's commit statuses.
1001-
func getAllCommitStatus(ctx context.Context, gitRepo *git.Repository, pr *issues_model.PullRequest) (statuses []*git_model.CommitStatus, err error) {
1001+
func getAllCommitStatus(ctx context.Context, gitRepo *git.Repository, pr *issues_model.PullRequest) ([]*git_model.CommitStatus, error) {
10021002
sha, shaErr := gitRepo.GetRefCommitID(pr.GetGitRefName())
10031003
if shaErr != nil {
10041004
return nil, shaErr
10051005
}
10061006

1007-
statuses, err = git_model.GetLatestCommitStatus(ctx, pr.BaseRepo.ID, sha, db.ListOptionsAll)
1008-
return statuses, err
1007+
return git_model.GetLatestCommitStatus(ctx, pr.BaseRepo.ID, sha, db.ListOptionsAll)
10091008
}
10101009

10111010
// IsHeadEqualWithBranch returns if the commits of branchName are available in pull request head

services/repository/commitstatus/commitstatus.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,15 @@ func FindReposLastestCombinedStatuses(ctx context.Context, repos []*repo_model.R
158158
repoSHAs = append(repoSHAs, git_model.RepoSHA{RepoID: id, SHA: sha})
159159
}
160160

161-
summaryResults, err := git_model.GetLatestCombinedStatusForRepoAndSHAs(ctx, repoSHAs)
161+
combinedStatuses, err := git_model.GetLatestCombinedStatusForRepoAndSHAs(ctx, repoSHAs)
162162
if err != nil {
163163
return nil, fmt.Errorf("GetLatestCommitStatusForRepoAndSHAs: %v", err)
164164
}
165165

166-
for _, summary := range summaryResults {
166+
for _, combinedStatus := range combinedStatuses {
167167
for i, repo := range repos {
168-
if repo.ID == summary.RepoID {
169-
results[i] = summary
168+
if repo.ID == combinedStatus.RepoID {
169+
results[i] = combinedStatus
170170
repoSHAs = slices.DeleteFunc(repoSHAs, func(repoSHA git_model.RepoSHA) bool {
171171
return repoSHA.RepoID == repo.ID
172172
})

0 commit comments

Comments
 (0)