From ebaa9a6935487e05aec94e5791cfce9a5a41d458 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 23 Sep 2021 13:16:37 +0800 Subject: [PATCH] Fix bug --- models/commit_status.go | 4 ++-- models/pull.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/commit_status.go b/models/commit_status.go index b1a53a037759..7ec233e80d02 100644 --- a/models/commit_status.go +++ b/models/commit_status.go @@ -95,7 +95,7 @@ func getNextCommitStatusIndex(repoID int64, sha string) (int64, error) { defer commiter.Close() var preIdx int64 - _, err = ctx.Engine().SQL("SELECT max_index FROM `commit_status_index` WHERE repo_id = ?", repoID).Get(&preIdx) + _, err = ctx.Engine().SQL("SELECT max_index FROM `commit_status_index` WHERE repo_id = ? AND sha = ?", repoID, sha).Get(&preIdx) if err != nil { return 0, err } @@ -293,7 +293,7 @@ func NewCommitStatus(opts NewCommitStatusOptions) error { // Get the next Status Index idx, err := GetNextCommitStatusIndex(opts.Repo.ID, opts.SHA) if err != nil { - return fmt.Errorf("generate issue index failed: %v", err) + return fmt.Errorf("generate commit status index failed: %v", err) } ctx, committer, err := db.TxContext() diff --git a/models/pull.go b/models/pull.go index 92516735761d..5cb7b57286f6 100644 --- a/models/pull.go +++ b/models/pull.go @@ -450,7 +450,7 @@ func (pr *PullRequest) SetMerged() (bool, error) { func NewPullRequest(repo *Repository, issue *Issue, labelIDs []int64, uuids []string, pr *PullRequest) (err error) { idx, err := db.GetNextResourceIndex("issue_index", repo.ID) if err != nil { - return fmt.Errorf("generate issue index failed: %v", err) + return fmt.Errorf("generate pull request index failed: %v", err) } issue.Index = idx