domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Fix bug related to log

Browse source
This commit is contained in:
Unknown 2014-04-06 13:07:34 -04:00
parent cd5b800a21
commit 794cd27db3
3 changed files with 23 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
update.go
View file

@ -92,13 +92,11 @@ func runUpdate(c *cli.Context) {
newOid, err := git.NewOidFromString(newCommitId)
if err != nil {
qlog.Fatalf("runUpdate.Ref repoId: %v", err)
return
}
newCommit, err := repo.LookupCommit(newOid)
if err != nil {
qlog.Fatalf("runUpdate.Ref repoId: %v", err)
return
}
var l *list.List
@ -107,38 +105,32 @@ func runUpdate(c *cli.Context) {
l, err = repo.CommitsBefore(newCommit.Id())
if err != nil {
qlog.Fatalf("Find CommitsBefore erro:", err)
return
}
} else {
oldOid, err := git.NewOidFromString(oldCommitId)
if err != nil {
qlog.Fatalf("runUpdate.Ref repoId: %v", err)
return
}
oldCommit, err := repo.LookupCommit(oldOid)
if err != nil {
qlog.Fatalf("runUpdate.Ref repoId: %v", err)
return
}
l = repo.CommitsBetween(newCommit, oldCommit)
}
if err != nil {
qlog.Fatalf("runUpdate.Commit repoId: %v", err)
return
}
sUserId, err := strconv.Atoi(userId)
if err != nil {
qlog.Fatalf("runUpdate.Parse userId: %v", err)
return
}
repos, err := models.GetRepositoryByName(int64(sUserId), repoName)
if err != nil {
qlog.Fatalf("runUpdate.GetRepositoryByName userId: %v", err)
return
}
commits := make([]*base.PushCommit, 0)