Merge branch 'master' of localhost:xiaoxiao/gogs4

Conflicts:
	.gitignore
This commit is contained in:
Lunny Xiao 2014-03-25 17:28:02 +08:00
commit c0649c861c

View File

@ -13,6 +13,7 @@ import (
"os/exec" "os/exec"
"strconv" "strconv"
"strings" "strings"
"time"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/log"
@ -205,6 +206,8 @@ func runServ(k *cli.Context) {
return return
} }
time.Sleep(time.Second)
// find push reference name // find push reference name
var t = "ok refs/heads/" var t = "ok refs/heads/"
var i int var i int