fix error detect when push commits
This commit is contained in:
parent
6dfee30bf0
commit
2dde2a8ad3
2 changed files with 10 additions and 3 deletions
|
@ -192,7 +192,6 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
|
||||||
// Commits are appended in the reverse order.
|
// Commits are appended in the reverse order.
|
||||||
for i := len(commits) - 1; i >= 0; i-- {
|
for i := len(commits) - 1; i >= 0; i-- {
|
||||||
c := commits[i]
|
c := commits[i]
|
||||||
fmt.Println(c)
|
|
||||||
|
|
||||||
refMarked := make(map[int64]bool)
|
refMarked := make(map[int64]bool)
|
||||||
for _, ref := range IssueReferenceKeywordsPat.FindAllString(c.Message, -1) {
|
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)
|
issue, err := GetIssueByRef(ref)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if IsErrIssueNotExist(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -250,6 +252,9 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
|
||||||
|
|
||||||
issue, err := GetIssueByRef(ref)
|
issue, err := GetIssueByRef(ref)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if IsErrIssueNotExist(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -287,6 +292,9 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
|
||||||
|
|
||||||
issue, err := GetIssueByRef(ref)
|
issue, err := GetIssueByRef(ref)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if IsErrIssueNotExist(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -350,7 +358,7 @@ func CommitRepoAction(
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = updateIssuesCommit(u, repo, repoUserName, repoName, commit.Commits); err != nil {
|
if err = updateIssuesCommit(u, repo, repoUserName, repoName, commit.Commits); err != nil {
|
||||||
log.Debug("updateIssuesCommit: %v", err)
|
log.Error(4, "updateIssuesCommit: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -135,7 +135,6 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName
|
||||||
var actEmail string
|
var actEmail string
|
||||||
for e := l.Front(); e != nil; e = e.Next() {
|
for e := l.Front(); e != nil; e = e.Next() {
|
||||||
commit := e.Value.(*git.Commit)
|
commit := e.Value.(*git.Commit)
|
||||||
|
|
||||||
if actEmail == "" {
|
if actEmail == "" {
|
||||||
actEmail = commit.Committer.Email
|
actEmail = commit.Committer.Email
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue