Merge remote-tracking branch 'giteaofficial/main'

zjjhot · zjjhot · commit c697b51b712d · 2022-02-25T16:20:14.000+08:00
* giteaofficial/main: BeforeSourcePath should point to base commit (go-gitea#18799)
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
@@ -78,8 +78,8 @@ func setPathsCompareContext(ctx *context.Context, base, head *git.Commit, headOw
 	ctx.Data["SourcePath"] = SourceCommitURL(headOwner, headName, head)
 	ctx.Data["RawPath"] = RawCommitURL(headOwner, headName, head)
 	if base != nil {
-		ctx.Data["BeforeSourcePath"] = SourceCommitURL(headOwner, headName, head)
-		ctx.Data["BeforeRawPath"] = RawCommitURL(headOwner, headName, head)
+		ctx.Data["BeforeSourcePath"] = SourceCommitURL(headOwner, headName, base)
+		ctx.Data["BeforeRawPath"] = RawCommitURL(headOwner, headName, base)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ func setPathsCompareContext(ctx context.Context, base, head git.Commit, headOw`
`78`	`78`	`ctx.Data["SourcePath"] = SourceCommitURL(headOwner, headName, head)`
`79`	`79`	`ctx.Data["RawPath"] = RawCommitURL(headOwner, headName, head)`
`80`	`80`	`if base != nil {`
`81`		`- ctx.Data["BeforeSourcePath"] = SourceCommitURL(headOwner, headName, head)`
`82`		`- ctx.Data["BeforeRawPath"] = RawCommitURL(headOwner, headName, head)`
	`81`	`+ ctx.Data["BeforeSourcePath"] = SourceCommitURL(headOwner, headName, base)`
	`82`	`+ ctx.Data["BeforeRawPath"] = RawCommitURL(headOwner, headName, base)`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`