core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73 from zhsso/dev 

combine getCommit ById and ByBranch in routers/repo/commit.go
This commit is contained in:
无闻 2014-04-11 23:14:28 -04:00
parent 5d30bfc8ba 2e6d50addc
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 nextPage = 0
} }
var commits *list.List //both `git log branchName` and `git log commitId` work
if models.IsBranchExist(userName, repoName, branchName) { commits, err := models.GetCommitsByRange(repoPath, branchName, page)
// 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
}
ctx.Data["Username"] = userName ctx.Data["Username"] = userName
ctx.Data["Reponame"] = repoName ctx.Data["Reponame"] = repoName