Fix API for branches with slashes (#2096)

routers/api/v1/api.go

@@ -364,7 +364,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					Post(bind(api.CreateForkOption{}), repo.CreateFork)
 				m.Group("/branches", func() {
 					m.Get("", repo.ListBranches)
-					m.Get("/:branchname", repo.GetBranch)
+					m.Get("/*", context.RepoRef(), repo.GetBranch)
 				})
 				m.Group("/keys", func() {
 					m.Combo("").Get(repo.ListDeployKeys).

routers/api/v1/repo/branch.go

@@ -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)