Merge branch 'main' into revert-aria-role

GiteaBot · web-flow · commit 6d0dc1e3dac3 · 2023-04-16T07:17:18.000-04:00
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
@@ -551,7 +551,11 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo {
 		ctx.ServerError("GetCompareInfo", err)
 		return nil
 	}
-	ctx.Data["BeforeCommitID"] = ci.CompareInfo.MergeBase
+	if ci.DirectComparison {
+		ctx.Data["BeforeCommitID"] = ci.CompareInfo.BaseCommitID
+	} else {
+		ctx.Data["BeforeCommitID"] = ci.CompareInfo.MergeBase
+	}
 
 	return ci
 }

Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,11 @@ func ParseCompareInfo(ctx context.Context) CompareInfo {`
`551`	`551`	`ctx.ServerError("GetCompareInfo", err)`
`552`	`552`	`return nil`
`553`	`553`	`}`
`554`		`- ctx.Data["BeforeCommitID"] = ci.CompareInfo.MergeBase`
	`554`	`+ if ci.DirectComparison {`
	`555`	`+ ctx.Data["BeforeCommitID"] = ci.CompareInfo.BaseCommitID`
	`556`	`+ } else {`
	`557`	`+ ctx.Data["BeforeCommitID"] = ci.CompareInfo.MergeBase`
	`558`	`+ }`
`555`	`559`
`556`	`560`	`return ci`
`557`	`561`	`}`