summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-13 22:20:28 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-13 22:20:28 -0400
commit190b83e05eb1ade979c0e17314ab892832d62e5b (patch)
treeebf8b9c6c7f8f383cfc057c3f33aa984f698a428 /models
parentd2b53dd43b3bc9719985033bc92b76abb9515b4d (diff)
downloadgitea-190b83e05eb1ade979c0e17314ab892832d62e5b.tar.gz
gitea-190b83e05eb1ade979c0e17314ab892832d62e5b.zip
push tag support
Diffstat (limited to 'models')
-rw-r--r--models/action.go13
-rw-r--r--models/update.go2
2 files changed, 9 insertions, 6 deletions
diff --git a/models/action.go b/models/action.go
index 3edb884e27..a9a41a9f4d 100644
--- a/models/action.go
+++ b/models/action.go
@@ -6,9 +6,10 @@ package models
import (
"encoding/json"
+ "strings"
"time"
- // "github.com/gogits/git"
+ "github.com/gogits/git"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
@@ -74,10 +75,12 @@ func CommitRepoAction(userId int64, userName, actEmail string,
opType := OP_COMMIT_REPO
// Check it's tag push or branch.
- // if git.IsTagExist(RepoPath(userName, repoName), refName) {
- // opType = OP_PUSH_TAG
- // commit = &base.PushCommits{}
- // }
+ if strings.HasPrefix(refName, "refs/tags/") {
+ opType = OP_PUSH_TAG
+ commit = &base.PushCommits{}
+ }
+
+ refName = git.RefEndName(refName)
bs, err := json.Marshal(commit)
if err != nil {
diff --git a/models/update.go b/models/update.go
index ba0e979348..2f59547b72 100644
--- a/models/update.go
+++ b/models/update.go
@@ -78,7 +78,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoName string, userId
//commits = append(commits, []string{lastCommit.Id().String(), lastCommit.Message()})
if err = CommitRepoAction(userId, userName, actEmail,
- repos.Id, repoName, git.RefEndName(refName), &base.PushCommits{l.Len(), commits}); err != nil {
+ repos.Id, repoName, refName, &base.PushCommits{l.Len(), commits}); err != nil {
qlog.Fatalf("runUpdate.models.CommitRepoAction: %v", err)
}
}