diff options
| -rw-r--r-- | models/action.go | 12 | ||||
| -rw-r--r-- | models/update.go | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/models/action.go b/models/action.go index 07e4da8f95..e38cf593b8 100644 --- a/models/action.go +++ b/models/action.go @@ -192,7 +192,6 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string // Commits are appended in the reverse order. for i := len(commits) - 1; i >= 0; i-- { c := commits[i] - fmt.Println(c) refMarked := make(map[int64]bool) for _, ref := range IssueReferenceKeywordsPat.FindAllString(c.Message, -1) { @@ -214,6 +213,9 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string issue, err := GetIssueByRef(ref) if err != nil { + if IsErrIssueNotExist(err) { + continue + } return err } @@ -250,6 +252,9 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string issue, err := GetIssueByRef(ref) if err != nil { + if IsErrIssueNotExist(err) { + continue + } return err } @@ -287,6 +292,9 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string issue, err := GetIssueByRef(ref) if err != nil { + if IsErrIssueNotExist(err) { + continue + } return err } @@ -350,7 +358,7 @@ func CommitRepoAction( } if err = updateIssuesCommit(u, repo, repoUserName, repoName, commit.Commits); err != nil { - log.Debug("updateIssuesCommit: %v", err) + log.Error(4, "updateIssuesCommit: %v", err) } } diff --git a/models/update.go b/models/update.go index 2fd00ad7e8..cbaf0e6618 100644 --- a/models/update.go +++ b/models/update.go @@ -135,7 +135,6 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName var actEmail string for e := l.Front(); e != nil; e = e.Next() { commit := e.Value.(*git.Commit) - if actEmail == "" { actEmail = commit.Committer.Email } |