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

feat(FN-4672): complete Step 1 — fix rebase shortstat source

Browse Source 
Fusion-Task-Id: FN-4672
Fusion-Task-Lineage: e05a4a1d-1750-498d-a229-df581fd528e3
This commit is contained in:
Fusion
2026-05-15 14:52:19 -07:00
committed by gsxdsm
parent e50a4b5ad6
commit 6b2f887a66
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/engine/src/self-healing.ts
View File

@@ -2809,9 +2809,13 @@ export class SelfHealingManager {
private async readShortstatForSha(
sha: string,
rebaseBaseSha?: string,
): Promise<{ filesChanged: number; insertions: number; deletions: number } | null> {
try {
const stats = await execAsync(`git show --shortstat --format= ${shellQuote(sha)}`, {
const command = rebaseBaseSha
? `git diff --shortstat ${shellQuote(`${rebaseBaseSha}..${sha}`)}`
: `git show --shortstat --format= ${shellQuote(sha)}`;
const stats = await execAsync(command, {
cwd: this.options.rootDir,
maxBuffer: 1024 * 1024,
});
@@ -2866,7 +2870,7 @@ export class SelfHealingManager {
continue;
}
const liveShortstat = await this.readShortstatForSha(storedSha);
const liveShortstat = await this.readShortstatForSha(storedSha, task.mergeDetails?.rebaseBaseSha);
const liveLandedFiles = await this.readLandedFilesForSha(storedSha, task.mergeDetails?.rebaseBaseSha);
const currentLandedFiles = task.mergeDetails?.landedFiles;
const landedFilesMismatch = Boolean(