diff options
author | skyblue <ssx205@gmail.com> | 2014-03-26 21:26:54 +0800 |
---|---|---|
committer | skyblue <ssx205@gmail.com> | 2014-03-26 21:26:54 +0800 |
commit | bffa6979b015bd6f5980c700537bb7b5b363985c (patch) | |
tree | 65727ee90e4ea84490a43adf8fd7844951bb9002 /update.go | |
parent | 4662a73ac34adeeeb6fc48ba6ac69b6a4adf18bc (diff) | |
parent | 7ab94fe816bd726c995f2937a040c3d8c7898205 (diff) | |
download | gitea-bffa6979b015bd6f5980c700537bb7b5b363985c.tar.gz gitea-bffa6979b015bd6f5980c700537bb7b5b363985c.zip |
Merge branch 'master' of 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) } |