Fix API for branches with slashes (#2096)

This commit is contained in:
Ethan Koenig 2017-07-01 22:03:57 -04:00 committed by Lunny Xiao
parent fea902adc8
commit f99489d5c5
4 changed files with 54 additions and 2 deletions

View file

@ -15,7 +15,14 @@ import (
// GetBranch get a branch of a repository
// see 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"))
if ctx.Repo.TreePath != "" {
// if TreePath != "", then URL contained extra slashes
// (i.e. "master/subbranch" instead of "master"), so branch does
// not exist
ctx.Status(404)
return
}
branch, err := ctx.Repo.Repository.GetBranch(ctx.Repo.BranchName)
if err != nil {
if models.IsErrBranchNotExist(err) {
ctx.Error(404, "GetBranch", err)