From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 23 Mar 2014 08:43:31 +0000 (+0800)
Subject: merge
X-Git-Tag: v0.9.99~2383
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5c57a06c51ab17d18dcd3a8aeb81858e22b7236b;p=gitea.git

merge
---

5c57a06c51ab17d18dcd3a8aeb81858e22b7236b
diff --cc serve.go
index b786c54356,be8dedc985..54296049d5
--- a/serve.go
+++ b/serve.go
@@@ -104,20 -84,15 +104,20 @@@ func runServ(k *cli.Context) 
  		repoName = repoName[:len(repoName)-4]
  	}
  
 -	os.Setenv("userName", user.Name)
 -	os.Setenv("userId", strconv.Itoa(int(user.Id)))
 +	//os.Setenv("userName", user.Name)
 +	//os.Setenv("userId", strconv.Itoa(int(user.Id)))
- 	repo, err := models.GetRepositoryByName(user, repoName)
+ 	repo, err := models.GetRepositoryByName(user.Id, repoName)
 +	var isExist bool = true
  	if err != nil {
 -		println("Unavilable repository", err)
 -		return
 +		if err == models.ErrRepoNotExist {
 +			isExist = false
 +		} else {
 +			println("Unavilable repository", err)
 +			return
 +		}
  	}
 -	os.Setenv("repoId", strconv.Itoa(int(repo.Id)))
 -	os.Setenv("repoName", repoName)
 +	//os.Setenv("repoId", strconv.Itoa(int(repo.Id)))
 +	//os.Setenv("repoName", repoName)
  
  	isWrite := In(verb, COMMANDS_WRITE)
  	isRead := In(verb, COMMANDS_READONLY)