Skip to content

fix: prove integration base #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yaacovcorcos merged 2 commits into from
Jul 18, 2026
Merged

fix: prove integration base #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b23248
fix: prove integration base
yaacovcorcos Jul 18, 2026
c8f3651
style: format integration proof
yaacovcorcos Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion scripts/scient-upstream-check.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,12 @@ function main(): void {
run("git", ["cat-file", "-e", `${state.reviewedThrough}^{commit}`]);
run("git", ["cat-file", "-e", `${state.integrationBase}^{commit}`]);
assertAncestor(state.reviewedThrough, upstreamTip, "Invalid upstream review checkpoint");
assertAncestor(state.integrationBase, "HEAD", "Invalid integrated upstream base");
assertAncestor(
state.integrationBase,
upstreamTip,
"Integration base is not official upstream history",
);
assertAncestor(state.integrationBase, "HEAD", "Integration base is not present in owned history");

const [ahead = "unknown", behind = "unknown"] = run("git", [
"rev-list",
Expand Down
Loading