root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(FN-5456): tidy autocorrect shell quoting and disambiguate checkout

Browse Source 
- Hoist `refs/heads/<name>` into a single quoted token before the verify
  call so the shell-quote boundary is unambiguous in the rendered
  command.
- Append `--` to the recovery `git checkout` so a same-named tracked
  path cannot win the DWIM resolution. The ref existence was already
  verified, so this can only resolve as the branch.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
gsxdsm
2026-05-23 00:03:12 -07:00
parent d3ad0641c4
commit d9fe33fec6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/engine/src/__tests__/branch-autocorrect.test.ts
View File

@@ -87,8 +87,8 @@ describe("attemptBranchAutocorrect", () => {
expect(result).toEqual({ status: "checked-out" }); expect(result).toEqual({ status: "checked-out" });
expect(mockedExec.mock.calls.map((c: unknown[]) => c[0])).toEqual([ expect(mockedExec.mock.calls.map((c: unknown[]) => c[0])).toEqual([
"git rev-parse --abbrev-ref --symbolic-full-name 'lemon-sage'@{u}", "git rev-parse --abbrev-ref --symbolic-full-name 'lemon-sage'@{u}",
"git show-ref --verify --quiet refs/heads/'fusion/fn-2'", "git show-ref --verify --quiet 'refs/heads/fusion/fn-2'",
"git checkout 'fusion/fn-2'", "git checkout 'fusion/fn-2' --",
]); ]);
}); });

7
packages/engine/src/branch-autocorrect.ts
View File

@@ -96,14 +96,17 @@ export async function attemptBranchAutocorrect({
// contamination pattern). Restrict the verify to refs/heads/ so a stray tag // contamination pattern). Restrict the verify to refs/heads/ so a stray tag
// or remote ref with the same name cannot satisfy the check and lead the // or remote ref with the same name cannot satisfy the check and lead the
// subsequent `git checkout` to a detached HEAD on the wrong object. // subsequent `git checkout` to a detached HEAD on the wrong object.
const expectedRefArg = quoteShellArg(`refs/heads/${expected}`);
const verifyExpected = await runGit( const verifyExpected = await runGit(
`git show-ref --verify --quiet refs/heads/${expectedArg}`, `git show-ref --verify --quiet ${expectedRefArg}`,
worktreePath, worktreePath,
); );
if (!verifyExpected.ok) { if (!verifyExpected.ok) {
return { status: "failed", reason: `expected branch ${expected} does not exist` }; return { status: "failed", reason: `expected branch ${expected} does not exist` };
} }
const checkout = await runGit(`git checkout ${expectedArg}`, worktreePath); // `--` disambiguates against a same-named tracked path; we already proved
// the ref exists, so this can only resolve as the branch.
const checkout = await runGit(`git checkout ${expectedArg} --`, worktreePath);
if (checkout.ok) { if (checkout.ok) {
return { status: "checked-out" }; return { status: "checked-out" };
} }