diff options
author | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-03-26 21:49:09 +0800 |
---|---|---|
committer | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-03-26 21:49:09 +0800 |
commit | 8c2f751bbb22ebf06c7f7f9621614b6e46130210 (patch) | |
tree | 5b90a56d40ef41431aa68bfc4c3733d9d5745b55 /update.go | |
parent | 08405a4fea1d2e5c73a73dafd866e0c00c7749c2 (diff) | |
parent | 32e05ae2120e864d6e1bd85fb01ef87e23c3ae89 (diff) |
Merge branch 'master' of https://github.com/gogits/gogs
Diffstat (limited to 'update.go')
-rw-r--r-- | update.go | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -5,18 +5,18 @@ package main import ( -"os" -"os/exec" -"strings" -"strconv" -"container/list" - -"github.com/codegangsta/cli" -//"github.com/gogits/gogs/modules/log" -"github.com/gogits/gogs/models" -"github.com/gogits/gogs/modules/base" -"github.com/qiniu/log" -"github.com/gogits/git" + "container/list" + "os" + "os/exec" + "strconv" + "strings" + + "github.com/codegangsta/cli" + //"github.com/gogits/gogs/modules/log" + "github.com/gogits/git" + "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/base" + "github.com/qiniu/log" ) var CmdUpdate = cli.Command{ @@ -103,7 +103,7 @@ func runUpdate(c *cli.Context) { // if a new branch if strings.HasPrefix(oldCommitId, "0000000") { l, err = ref.AllCommits() - + } else { l = ref.CommitsBetween(newCommit, oldCommit) } |