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

cmd/serve.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -30,7 +31,7 @@ var CmdServ = cli.Command{
 
 func setup(logPath string) {
 	setting.NewConfigContext()
-	log.NewGitLogger(path.Join(setting.LogRootPath, logPath))
+	log.NewGitLogger(filepath.Join(setting.LogRootPath, logPath))
 	models.LoadModelsConfig()
 
 	if models.UseSQLite3 {
@@ -166,7 +167,6 @@ func runServ(k *cli.Context) {
 		return
 	}
 
-	//models.SetRepoEnvs(user.Id, user.Name, repoName, repoUserName)
 	uuid := uuid.NewV4().String()
 	os.Setenv("uuid", uuid)
 

cmd/update.go

@@ -35,10 +35,6 @@ func runUpdate(c *cli.Context) {
 		log.GitLogger.Fatal("refName is empty, shouldn't use")
 	}
 
-	//userName := os.Getenv("userName")
-	//userId, _ := strconv.ParseInt(os.Getenv("userId"), 10, 64)
-	//repoUserName := os.Getenv("repoUserName")
-	//repoName := os.Getenv("repoName")
 	uuid := os.Getenv("uuid")
 
 	task := models.UpdateTask{
@@ -48,14 +44,7 @@ func runUpdate(c *cli.Context) {
 		NewCommitId: args[2],
 	}
 
-	log.GitLogger.Error("%v", task)
-
 	if err := models.AddUpdateTask(&task); err != nil {
 		log.GitLogger.Fatal(err.Error())
 	}
-
-	/*if err := models.Update(args[0], args[1], args[2], userName, repoUserName, repoName, userId); err != nil {
-		log.GitLogger.Fatal(err.Error())
-	}*/
-	//setEnvs(args[0], args[1], args[2], userName, repoUserName, repoName, userId)
 }