diff --git a/scripts/scient-upstream-check.ts b/scripts/scient-upstream-check.ts index a5069c4e6..268504537 100644 --- a/scripts/scient-upstream-check.ts +++ b/scripts/scient-upstream-check.ts @@ -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",