diff options
author | Unknwon <joe2010xtmf@163.com> | 2014-10-10 21:40:51 -0400 |
---|---|---|
committer | Unknwon <joe2010xtmf@163.com> | 2014-10-10 21:40:51 -0400 |
commit | b2632dec099cb2727933149d2d59cc5e46baa15f (patch) | |
tree | 0339b98dcd6a38bf9a02e3681d4e22a024ceaa9f /models/update.go | |
parent | 54930c001df8316d8dfda450b5c39379df2cc1b1 (diff) | |
download | gitea-b2632dec099cb2727933149d2d59cc5e46baa15f.tar.gz gitea-b2632dec099cb2727933149d2d59cc5e46baa15f.zip |
Page: Compare 2 commits
Diffstat (limited to 'models/update.go')
-rw-r--r-- | models/update.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/models/update.go b/models/update.go index d939a90874..33b7733e18 100644 --- a/models/update.go +++ b/models/update.go @@ -106,7 +106,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName if err = CommitRepoAction(userId, ru.Id, userName, actEmail, repos.Id, repoUserName, repoName, refName, commit, oldCommitId, newCommitId); err != nil { - log.GitLogger.Fatal(4, "runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) + log.GitLogger.Fatal(4, "CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) } return err } @@ -116,8 +116,8 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName return fmt.Errorf("runUpdate GetCommit of newCommitId: %v", err) } + // Push new branch. var l *list.List - // if a new branch if isNew { l, err = newCommit.CommitsBefore() if err != nil { @@ -134,7 +134,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName return fmt.Errorf("runUpdate.Commit repoId: %v", err) } - // if commits push + // Push commits. commits := make([]*base.PushCommit, 0) var actEmail string for e := l.Front(); e != nil; e = e.Next() { @@ -153,9 +153,8 @@ 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}, oldCommitId, newCommitId); 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 |