From 7b23248d21545cde796314e8157faf3c0b02e284 Mon Sep 17 00:00:00 2001 From: Yaacov Date: Sat, 18 Jul 2026 13:02:24 +0300 Subject: [PATCH 1/2] fix: prove integration base --- scripts/scient-upstream-check.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/scient-upstream-check.ts b/scripts/scient-upstream-check.ts index a5069c4e6..c49157ac6 100644 --- a/scripts/scient-upstream-check.ts +++ b/scripts/scient-upstream-check.ts @@ -238,7 +238,8 @@ 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", From c8f3651fabe722ac60bb727f6c66afc30cbed9e7 Mon Sep 17 00:00:00 2001 From: Yaacov Date: Sat, 18 Jul 2026 13:06:13 +0300 Subject: [PATCH 2/2] style: format integration proof --- scripts/scient-upstream-check.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/scient-upstream-check.ts b/scripts/scient-upstream-check.ts index c49157ac6..268504537 100644 --- a/scripts/scient-upstream-check.ts +++ b/scripts/scient-upstream-check.ts @@ -238,7 +238,11 @@ 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, upstreamTip, "Integration base is not official upstream history"); + 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", [