Skip to content

test: fix graft clobber-guard test on unsigned commits (CI) #12

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
flipvh merged 1 commit into from
Jul 9, 2026
+8 −1
Merged

test: fix graft clobber-guard test on unsigned commits (CI) #12

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
9 changes: 8 additions & 1 deletion tests/e2e/sync-base-graft.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,14 @@ describe('withTemporarySyncBaseGraft', () => {
it('never clobbers an existing replacement object on the HEAD commit', async () => {
const head = exec('git rev-parse HEAD', forkPath);
const parent = exec('git rev-parse HEAD^', forkPath);
exec(`git replace -f --graft ${head} ${parent}`, forkPath);
// Graft HEAD onto its existing parent PLUS a fabricated orphan commit, so the
// replacement object genuinely differs from the original (a same-parents graft is a
// byte-identical commit when unsigned, which git refuses). The orphan does not make
// upstreamBlockSha reachable, so the helper still hits the existing-replacement guard
// rather than the native-ancestor guard.
const tree = exec('git rev-parse HEAD^{tree}', forkPath);
const orphan = exec(`git commit-tree ${tree} -m "distinct graft parent"`, forkPath);
exec(`git replace -f --graft ${head} ${parent} ${orphan}`, forkPath);

await withTemporarySyncBaseGraft(forkPath, 'HEAD', upstreamBlockSha, async () => 'ok');

Expand Down