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

feat(FN-4688): complete Step 1 — ungate rebase base persistence

Browse Source 
Fusion-Task-Id: FN-4688
Fusion-Task-Lineage: 49abde1d-3480-4127-beb0-5dadce30b9e1
This commit is contained in:
Fusion (runfusion.ai)
2026-05-15 16:28:04 -07:00
committed by gsxdsm
parent eaaec4ff22
commit 6c542462ed
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/engine/src/merger.ts
View File

@@ -7291,7 +7291,7 @@ export async function aiMergeTask(
let landedFiles: string[] | undefined;
try {
const statsCommand = selectedPostMergeAuditStrategy === "rebase" && rebaseMergeBaseSha
const statsCommand = rebaseMergeBaseSha
? `git diff --shortstat ${quoteArg(`${rebaseMergeBaseSha}..HEAD`)}`
: "git show --shortstat --format= HEAD";
const { stdout: statsOutput } = await execAsync(statsCommand, {
@@ -7410,7 +7410,7 @@ export async function aiMergeTask(
if (!isEmptyCommit && !mergeWasEmpty && recordedSha) {
try {
const landedFilesCommand = selectedPostMergeAuditStrategy === "rebase" && rebaseMergeBaseSha
const landedFilesCommand = rebaseMergeBaseSha
? `git diff --name-only ${quoteArg(`${rebaseMergeBaseSha}..${recordedSha}`)}`
: `git show --name-only --format= ${quoteArg(recordedSha)}`;
const { stdout: landedFilesOutput } = await execAsync(landedFilesCommand, {
@@ -7432,7 +7432,7 @@ export async function aiMergeTask(
const mergeDetails: MergeDetails = {
commitSha: recordedSha,
rebaseBaseSha: selectedPostMergeAuditStrategy === "rebase" && !mergeWasEmpty ? rebaseMergeBaseSha : undefined,
rebaseBaseSha: !mergeWasEmpty && rebaseMergeBaseSha ? rebaseMergeBaseSha : undefined,
landedFiles,
filesChanged: recordedFilesChanged,
insertions: recordedInsertions,