From e5ae41e21f7fa1e25f04a28d907b89c78196c824 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 28 Jun 2014 14:55:33 +0800 Subject: bug fixed #261 --- models/update.go | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'models/update.go') diff --git a/models/update.go b/models/update.go index 5675a94cf4..188e6cb9c7 100644 --- a/models/update.go +++ b/models/update.go @@ -16,6 +16,8 @@ import ( ) func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName string, userId int64) { + //fmt.Println(refName, oldCommitId, newCommitId) + //fmt.Println(userName, repoUserName, repoName) isNew := strings.HasPrefix(oldCommitId, "0000000") if isNew && strings.HasPrefix(newCommitId, "0000000") { @@ -74,11 +76,40 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName log.GitLogger.Fatal("runUpdate.GetRepositoryByName userId: %v", err) } + // if tags push + if strings.HasPrefix(refName, "refs/tags/") { + tagName := git.RefEndName(refName) + tag, err := repo.GetTag(tagName) + if err != nil { + log.GitLogger.Fatal("runUpdate.GetTag: %v", err) + } + + var actEmail string + if tag.Tagger != nil { + actEmail = tag.Tagger.Email + } else { + cmt, err := tag.Commit() + if err != nil { + log.GitLogger.Fatal("runUpdate.GetTag Commit: %v", err) + } + actEmail = cmt.Committer.Email + } + + commit := &base.PushCommits{} + + if err = CommitRepoAction(userId, ru.Id, userName, actEmail, + repos.Id, repoUserName, repoName, refName, commit); err != nil { + log.GitLogger.Fatal("runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) + } + return + } + commits := make([]*base.PushCommit, 0) var maxCommits = 3 var actEmail string for e := l.Front(); e != nil; e = e.Next() { commit := e.Value.(*git.Commit) + if actEmail == "" { actEmail = commit.Committer.Email } -- cgit v1.2.3 From 54e17c7cca15aafc11bf394752ed0f1feb6f6979 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 28 Jun 2014 15:00:03 +0800 Subject: bug fixed #261 --- models/update.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models/update.go') diff --git a/models/update.go b/models/update.go index 0231b6af38..6702ad3b46 100644 --- a/models/update.go +++ b/models/update.go @@ -100,7 +100,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName repos.Id, repoUserName, repoName, refName, commit); err != nil { log.GitLogger.Fatal("runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err) } - return + return err } // if commits push -- cgit v1.2.3