linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

Merge pull request #73 from zhsso/dev

Browse Source 
combine getCommit ById and ByBranch in routers/repo/commit.go
This commit is contained in:
无闻 2014-04-11 23:14:28 -04:00
commit 3df8b2bef0
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
routers/repo/commit.go
View File

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