From 2e6d50addcd2e9418476d56312622329de5e9aab Mon Sep 17 00:00:00 2001 From: zhsso Date: Fri, 11 Apr 2014 22:57:25 -0400 Subject: [PATCH] combine getCommit ById and ByBranch in routers/repo/commit.go --- routers/repo/commit.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/routers/repo/commit.go b/routers/repo/commit.go index e6f6d7ed..5a7bb589 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -50,18 +50,8 @@ func Commits(ctx *middleware.Context, params martini.Params) { nextPage = 0 } - var commits *list.List - if models.IsBranchExist(userName, repoName, branchName) { - // commits, err = models.GetCommitsByBranch(userName, repoName, branchName) - commits, err = models.GetCommitsByRange(repoPath, branchName, page) - } else { - commits, err = models.GetCommitsByCommitId(userName, repoName, branchName) - } - - if err != nil { - ctx.Handle(404, "repo.Commits(get commits)", err) - return - } + //both `git log branchName` and `git log commitId` work + commits, err := models.GetCommitsByRange(repoPath, branchName, page) ctx.Data["Username"] = userName ctx.Data["Reponame"] = repoName