From b7b30cd85e5cabd9d643013ffb10dafd133b18ea Mon Sep 17 00:00:00 2001
From: Antoine GIRARD <sapk@sapk.fr>
Date: Thu, 28 Jan 2016 20:49:05 +0100
Subject: Corrections following recommendations

---
 routers/api/v1/repo/branch.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'routers/api/v1/repo/branch.go')

diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go
index 2f4c36f7..d322b6b5 100644
--- a/routers/api/v1/repo/branch.go
+++ b/routers/api/v1/repo/branch.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2016 The Gogs Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
@@ -14,32 +14,32 @@ import (
 // Temporary: https://gist.github.com/sapk/df64347ff218baf4a277#get-a-branch
 // https://github.com/gogits/go-gogs-client/wiki/Repositories-Branches#get-a-branch
 func GetBranch(ctx *middleware.Context) {
-	//Getting the branch requested
-	branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":id"))
+	// Getting the branch requested
+	branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":branchname"))
 	if err != nil {
 		ctx.APIError(500, "Repository.GetBranch", err)
 		return
 	}
-	//Getting the last commit of the branch
+	// Getting the last commit of the branch
 	c, err := branch.GetCommit()
 	if err != nil {
 		ctx.APIError(500, "Branch.GetCommit", err)
 		return
 	}
-	//Converting to API format and send payload
+	// Converting to API format and send payload
 	ctx.JSON(200, convert.ToApiBranch(branch,c))
 }
 
 // Temporary: https://gist.github.com/sapk/df64347ff218baf4a277#list-branches
 // https://github.com/gogits/go-gogs-client/wiki/Repositories-Branches#list-branches
 func ListBranches(ctx *middleware.Context) {
-	//Listing of branches
+	// Listing of branches
 	Branches, err := ctx.Repo.Repository.GetBranches()
 	if err != nil {
 		ctx.APIError(500, "Repository.GetBranches", err)
 		return
 	}
-	//Getting the last commit of each branch
+	// Getting the last commit of each branch
 	apiBranches := make([]*api.Branch, len(Branches))
 	for i := range Branches {
 		c, err := Branches[i].GetCommit()
@@ -47,9 +47,9 @@ func ListBranches(ctx *middleware.Context) {
 			ctx.APIError(500, "Branch.GetCommit", err)
 			return
 		}
-		//Converting to API format
+		// Converting to API format
 		apiBranches[i] = convert.ToApiBranch(Branches[i],c)
 	}
-	//Sending the payload
+	// Sending the payload
 	ctx.JSON(200, &apiBranches)
 }
-- 
cgit v1.2.3