Skip to content

fix(ci): build conflict trees from main #7578

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
cv merged 1 commit into from
Jul 26, 2026
+36 −11
Merged

fix(ci): build conflict trees from main #7578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 32 additions & 3 deletions test/pr-merge-conflict-fixer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ function createConflictFixture(): {
git(repository, ["config", "commit.gpgsign", "false"]);
write(repository, "conflict.txt", "shared\n");
write(repository, "clean-merge.txt", "first\nkeep-1\nkeep-2\nkeep-3\nkeep-4\nkeep-5\nlast\n");
git(repository, ["add", "conflict.txt", "clean-merge.txt"]);
write(repository, "pr-deleted.txt", "delete this on the PR branch\n");
git(repository, ["add", "conflict.txt", "clean-merge.txt", "pr-deleted.txt"]);
git(repository, ["commit", "-m", "test: add shared file"]);

git(repository, ["checkout", "-b", "pull-request"]);
Expand All @@ -110,7 +111,8 @@ function createConflictFixture(): {
"clean-merge.txt",
"pull request\nkeep-1\nkeep-2\nkeep-3\nkeep-4\nkeep-5\nlast\n",
);
git(repository, ["add", "conflict.txt", "clean-merge.txt"]);
fs.rmSync(path.join(repository, "pr-deleted.txt"));
git(repository, ["add", "-A"]);
git(repository, ["commit", "-m", "test: change PR side"]);
const headSha = git(repository, ["rev-parse", "HEAD"]);

Expand Down Expand Up @@ -346,8 +348,14 @@ describe("PR merge conflict fixer", () => {
).not.toThrow();
});

it("creates a verified two-parent commit before the atomic head update (#7542)", async () => {
it("creates a verified commit from a main-relative tree before the atomic head update (#7542)", async () => {
const fixture = createConflictFixture();
for (let index = 0; index < 100; index += 1) {
write(fixture.repository, `stale-main/${index}.txt`, `main ${index}\n`);
}
git(fixture.repository, ["add", "stale-main"]);
git(fixture.repository, ["commit", "-m", "test: advance main beyond the PR head"]);
fixture.baseSha = git(fixture.repository, ["rev-parse", "HEAD"]);
const entry = entryFor(fixture);
const patchPath = path.join(temporaryDirectory(), "resolution.patch");
const finalTree = createResolutionPatch(fixture, patchPath);
Expand Down Expand Up @@ -409,6 +417,27 @@ describe("PR merge conflict fixer", () => {
tree: finalTree,
});
expect(JSON.stringify(commitRequest?.body)).not.toMatch(/author|committer|signature/u);
const treeRequest = required(
requests.find((item) => item.path.endsWith("/git/trees")),
"missing tree request",
);
const treeBody = treeRequest.body as {
base_tree: string;
tree: Array<{ mode: string; path: string; sha: string | null; type: string }>;
};
expect(treeBody.base_tree).toBe(entry.base_sha);
expect(treeBody.tree.map((item) => item.path)).toEqual([
"clean-merge.txt",
"conflict.txt",
"pr-deleted.txt",
]);
expect(treeBody.tree.find((item) => item.path === "pr-deleted.txt")).toEqual({
mode: "100644",
path: "pr-deleted.txt",
sha: null,
type: "blob",
});
expect(treeBody.tree.some((item) => item.path.startsWith("stale-main/"))).toBe(false);
const blobRequests = requests.filter((item) => item.path.endsWith("/git/blobs"));
expect(
blobRequests
Expand Down
12 changes: 4 additions & 8 deletions tools/pr-merge-conflict-fixer/publish.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,7 @@ function treeEntry(repository: string, tree: string, filePath: string): GitTreeE
return entry;
}

function parentContainsBlob(
repository: string,
parent: string,
entry: GitTreeEntry,
): boolean {
function parentContainsBlob(repository: string, parent: string, entry: GitTreeEntry): boolean {
const parentEntry = optionalTreeEntry(repository, parent, entry.path);
return parentEntry?.type === "blob" && parentEntry.sha === entry.sha;
}
Expand All @@ -179,8 +175,8 @@ async function createGitHubTree(input: {
request: GitHubRequest;
}): Promise<string> {
const entries: GitTreeEntry[] = [];
for (const change of changedPathStatuses(input.repository, input.headSha, input.finalTree)) {
const sourceTree = change.status === "D" ? input.headSha : input.finalTree;
for (const change of changedPathStatuses(input.repository, input.baseSha, input.finalTree)) {
const sourceTree = change.status === "D" ? input.baseSha : input.finalTree;
const entry = treeEntry(input.repository, sourceTree, change.path);
if (change.status === "D") {
entries.push({ ...entry, sha: null });
Expand All @@ -204,7 +200,7 @@ async function createGitHubTree(input: {
}

const created = (await input.request("POST", `/repos/${input.repositoryName}/git/trees`, {
base_tree: input.headSha,
base_tree: input.baseSha,
tree: entries,
})) as { sha?: string };
if (created.sha !== input.finalTree) {
Expand Down
Loading