diff options
author | 无闻 <joe2010xtmf@163.com> | 2014-09-01 20:02:34 -0700 |
---|---|---|
committer | 无闻 <joe2010xtmf@163.com> | 2014-09-01 20:02:34 -0700 |
commit | 85f375433dfb2114477b84350c67e80363747e21 (patch) | |
tree | 87ca44e3ed68fe111d16be285f17ff2e52f846b4 /models/update.go | |
parent | d55c5b9e289c0c97aa51ffe5cb5b77f703cc2a47 (diff) | |
parent | af0741da07ec190804fff2a84c3813fc62a1c3ba (diff) |
Merge pull request #416 from compressed/compare_commits
Add commit compare functionality
Diffstat (limited to 'models/update.go')
-rw-r--r-- | models/update.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/update.go b/models/update.go index 68a92ada..ec6a9790 100644 --- a/models/update.go +++ b/models/update.go @@ -101,7 +101,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName commit := &base.PushCommits{} if err = CommitRepoAction(userId, ru.Id, userName, actEmail, - repos.Id, repoUserName, repoName, refName, commit); err != nil { + repos.Id, repoUserName, repoName, refName, commit, oldCommitId, newCommitId); err != nil { log.GitLogger.Fatal(4, "runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) } return err @@ -152,7 +152,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName //commits = append(commits, []string{lastCommit.Id().String(), lastCommit.Message()}) if err = CommitRepoAction(userId, ru.Id, userName, actEmail, - repos.Id, repoUserName, repoName, refName, &base.PushCommits{l.Len(), commits}); err != nil { + repos.Id, repoUserName, repoName, refName, &base.PushCommits{l.Len(), commits}, oldCommitId, newCommitId); err != nil { return fmt.Errorf("runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) } return nil |