Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

fix(test): ask git for operation marker paths without an = flag, resolved against the root (#8755; cli-flag-equals reader scan)

garrytan58fe104149af
diff --git a/src/core/persistence/pending-import.ts b/src/core/persistence/pending-import.ts
index 6e579bd24f..f1e9547989 100644
--- a/src/core/persistence/pending-import.ts
+++ b/src/core/persistence/pending-import.ts
@@ -17,7 +17,7 @@
* is resubmitted by its caller after that sync.
*/
import { spawn } from '../spawn.ts';
-import { relative, sep } from 'node:path';
+import { relative, resolve, sep } from 'node:path';
import type { BrainEngine } from '../engine.ts';
import type { Action } from '../agent-output.ts';
import { gitChildEnv } from '../git-env.ts';
@@ -133,8 +133,8 @@ export async function unmergedPath(root: string, path: string, signal?: AbortSig
*/
export async function operationMarkerPaths(root: string, signal?: AbortSignal): Promise<string[] | null> {
const markers = ['MERGE_HEAD', 'CHERRY_PICK_HEAD', 'REVERT_HEAD', 'rebase-merge', 'rebase-apply'];
- return gitRead(root, ['rev-parse', '--path-format=absolute', ...markers.flatMap(marker => ['--git-path', marker])], signal)
- .then(out => { const paths = out.split('\n').filter(Boolean); return paths.length === markers.length ? paths : null; },
+ return gitRead(root, ['rev-parse', ...markers.flatMap(marker => ['--git-path', marker])], signal)
+ .then(out => { const paths = out.split('\n').filter(Boolean).map(path => resolve(root, path)); return paths.length === markers.length ? paths : null; },
error => { if (signal?.aborted) throw error; return null; });
}