tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions 1

Gracefully handle bare repositories on API operations. (#1932)

Browse source 
Signed-off-by: Dennis Keitzel <github@pinshot.net>
This commit is contained in:
Dennis Keitzel 2017-06-11 04:57:28 +02:00 committed by Bo-Yi Wu
parent f2fcd9dcd8
commit 96b4780727
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/repo_branch.go
View file

@ -39,7 +39,7 @@ func GetBranchesByPath(path string) ([]*Branch, error) {
// GetBranch returns a branch by it's name // GetBranch returns a branch by it's name
func (repo *Repository) GetBranch(branch string) (*Branch, error) { func (repo *Repository) GetBranch(branch string) (*Branch, error) {
if !git.IsBranchExist(repo.RepoPath(), branch) { if !git.IsBranchExist(repo.RepoPath(), branch) {
return nil, &ErrBranchNotExist{branch} return nil, ErrBranchNotExist{branch}
} }
return &Branch{ return &Branch{
Path: repo.RepoPath(), Path: repo.RepoPath(),

5
routers/api/v1/repo/branch.go
View file

@ -7,6 +7,7 @@ package repo
import ( import (
api "code.gitea.io/sdk/gitea" api "code.gitea.io/sdk/gitea"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/routers/api/v1/convert" "code.gitea.io/gitea/routers/api/v1/convert"
) )
@ -16,7 +17,11 @@ import (
func GetBranch(ctx *context.APIContext) { func GetBranch(ctx *context.APIContext) {
branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":branchname")) branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":branchname"))
if err != nil { if err != nil {
if models.IsErrBranchNotExist(err) {
ctx.Error(404, "GetBranch", err)
} else {
ctx.Error(500, "GetBranch", err) ctx.Error(500, "GetBranch", err)
}
return return
} }

5
routers/api/v1/repo/file.go
View file

@ -20,6 +20,11 @@ func GetRawFile(ctx *context.APIContext) {
return return
} }
if ctx.Repo.Repository.IsBare {
ctx.Status(404)
return
}
blob, err := ctx.Repo.Commit.GetBlobByPath(ctx.Repo.TreePath) blob, err := ctx.Repo.Commit.GetBlobByPath(ctx.Repo.TreePath)
if err != nil { if err != nil {
if git.IsErrNotExist(err) { if git.IsErrNotExist(err) {