Fix 2-dot direct compare to use the right base commit

go-gitea · Apr 15, 2023 · 766460c · 766460c
1 parent b4e9525
commit 766460c
Showing 1 changed file with 5 additions and 1 deletion.
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
 }