Merge branch 'master' of localhost:xiaoxiao/gogs4
Conflicts: .gitignore
This commit is contained in:
commit
c0649c861c
3
serve.go
3
serve.go
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue