diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/api.go | 2 | ||||
| -rw-r--r-- | routers/api/v1/repo/branch.go | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index df5fb5c3..6221bcd7 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -258,7 +258,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/forks", repo.ListForks) m.Group("/branches", func() { m.Get("", repo.ListBranches) - m.Get("/:branchname", repo.GetBranch) + m.Get("/*", repo.GetBranch) }) m.Group("/keys", func() { m.Combo("").Get(repo.ListDeployKeys). diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index a141921e..1d60b7d1 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -7,15 +7,20 @@ package repo import ( api "github.com/gogits/go-gogs-client" + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/context" "github.com/gogits/gogs/routers/api/v1/convert" ) // https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch func GetBranch(ctx *context.APIContext) { - branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":branchname")) + branch, err := ctx.Repo.Repository.GetBranch(ctx.Params("*")) if err != nil { - ctx.Error(500, "GetBranch", err) + if models.IsErrBranchNotExist(err) { + ctx.Error(404, "GetBranch", err) + } else { + ctx.Error(500, "GetBranch", err) + } return } |