core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fxied

This commit is contained in:
Lunny Xiao 2014-03-23 17:10:09 +08:00
parent d594bb386f
commit 21a138a75a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
serve.go
View File

@ -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,13 +183,18 @@ 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()