NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 20:17:03 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

Merge branch 'master' of github.com:gogits/gogs

Browse source
This commit is contained in:
slene 2014-03-23 17:22:33 +08:00
commit 91c3fc3e99
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
serve.go
View file

@ -15,7 +15,7 @@ import (
"strings" "strings"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/qiniu/log" "github.com/gogits/gogs/modules/log"
"github.com/gogits/git" "github.com/gogits/git"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
@ -104,8 +104,6 @@ func runServ(k *cli.Context) {
repoName = repoName[:len(repoName)-4] repoName = repoName[:len(repoName)-4]
} }
//os.Setenv("userName", user.Name)
//os.Setenv("userId", strconv.Itoa(int(user.Id)))
repo, err := models.GetRepositoryByName(user.Id, repoName) repo, err := models.GetRepositoryByName(user.Id, repoName)
var isExist bool = true var isExist bool = true
if err != nil { if err != nil {
@ -116,8 +114,6 @@ func runServ(k *cli.Context) {
return return
} }
} }
//os.Setenv("repoId", strconv.Itoa(int(repo.Id)))
//os.Setenv("repoName", repoName)
isWrite := In(verb, COMMANDS_WRITE) isWrite := In(verb, COMMANDS_WRITE)
isRead := In(verb, COMMANDS_READONLY) isRead := In(verb, COMMANDS_READONLY)
@ -187,17 +183,22 @@ func runServ(k *cli.Context) {
b := bytes.NewBufferString(s) b := bytes.NewBufferString(s)
gitcmd.Stdout = io.MultiWriter(os.Stdout, b) gitcmd.Stdout = io.MultiWriter(os.Stdout, b)
gitcmd.Stdin = io.MultiReader(os.Stdin, b) //gitcmd.Stdin = io.MultiReader(os.Stdin, b)
gitcmd.Stdin = os.Stdin
gitcmd.Stderr = os.Stderr gitcmd.Stderr = os.Stderr
if err = gitcmd.Run(); err != nil { if err = gitcmd.Run(); err != nil {
println("execute command error:", err.Error()) println("execute command error:", err.Error())
} }
if !strings.HasPrefix(cmd, "git-receive-pack") {
return
}
// update // update
w, _ := os.Create("serve.log") //w, _ := os.Create("serve.log")
defer w.Close() //defer w.Close()
log.SetOutput(w) //log.SetOutput(w)
var t = "ok refs/heads/" var t = "ok refs/heads/"
var i int var i int
@ -226,7 +227,7 @@ func runServ(k *cli.Context) {
return return
} }
if ref, ok = refs[refname]; !ok { if ref, ok = refs[refname]; !ok {
println("unknow reference name", refname) println("unknow reference name -", refname, "-")
return return
} }
l, err = ref.AllCommits() l, err = ref.AllCommits()