aboutsummaryrefslogtreecommitdiff
path: root/routers/repo/commit.go
diff options
context:
space:
mode:
Diffstat (limited to 'routers/repo/commit.go')
-rw-r--r--routers/repo/commit.go14
1 files changed, 12 insertions, 2 deletions
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 97584c4d..16f7b63d 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -148,9 +148,14 @@ func Diff(ctx *context.Context) {
userName := ctx.Repo.Owner.Name
repoName := ctx.Repo.Repository.Name
- commitID := ctx.Repo.CommitID
+ commitID := ctx.Params(":sha")
+
+ commit, err := ctx.Repo.GitRepo.GetCommit(commitID)
+ if err != nil {
+ ctx.Handle(500, "Repo.GitRepo.GetCommit", err)
+ return
+ }
- commit := ctx.Repo.Commit
diff, err := models.GetDiffCommit(models.RepoPath(userName, repoName),
commitID, setting.Git.MaxGitDiffLines)
if err != nil {
@@ -168,6 +173,7 @@ func Diff(ctx *context.Context) {
}
}
+ ctx.Data["CommitID"] = commitID
ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split"
ctx.Data["Username"] = userName
ctx.Data["Reponame"] = repoName
@@ -187,6 +193,10 @@ func Diff(ctx *context.Context) {
ctx.HTML(200, DIFF)
}
+func RawDiff(ctx *context.Context) {
+ panic("not implemented")
+}
+
func CompareDiff(ctx *context.Context) {
ctx.Data["IsRepoToolbarCommits"] = true
ctx.Data["IsDiffCompare"] = true