singularity/singularity-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(git-service): fix merge-base ancestry check and .gsd/ leakage in snapshot absorption

Browse source 
- Check HEAD~1 (newest snapshot) instead of resetTarget (pre-snapshot
  base) for remote ancestry. The old check false-positived when the
  remote was at the pre-snapshot base but snapshots were local-only.
- Re-run smartStage() after soft reset so RUNTIME_EXCLUSION_PATHS
  apply to the absorbed commit. Without this, .gsd/ state files from
  snapshot commits leaked into the real commit.
This commit is contained in:
Jeremy 2026-03-30 10:43:06 -05:00
parent fa0651bfd6
commit 36b03890da
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/resources/extensions/gsd/git-service.ts
View file

@ -610,19 +610,22 @@ export class GitServiceImpl {
if (count === 0) return;
// Guard: don't rewrite history that has been pushed to the remote.
// If the reset target is an ancestor of the remote tracking branch,
// those commits are published and must not be squashed.
// Check whether the newest snapshot commit (HEAD~1) is already
// reachable from the remote tracking branch. If it is, the snapshots
// have been pushed and must not be squashed via local history rewrite.
// (Checking resetTarget instead would false-positive when the remote
// is at the pre-snapshot base but the snapshots themselves are local.)
const resetTarget = `HEAD~${count + 1}`;
try {
const branch = nativeGetCurrentBranch(this.basePath);
if (branch) {
const remoteBranch = `origin/${branch}`;
// merge-base --is-ancestor exits 0 if resetTarget is ancestor of remote
execFileSync("git", ["merge-base", "--is-ancestor", resetTarget, remoteBranch], {
// merge-base --is-ancestor exits 0 if HEAD~1 is ancestor of remote
execFileSync("git", ["merge-base", "--is-ancestor", "HEAD~1", remoteBranch], {
cwd: this.basePath,
stdio: ["ignore", "pipe", "pipe"],
});
// If we get here, resetTarget IS an ancestor of remote — snapshots are pushed
// If we get here, newest snapshot IS reachable from remote — already pushed
return;
}
} catch {
@ -638,6 +641,12 @@ export class GitServiceImpl {
nativeResetSoft(this.basePath, resetTarget);
// Re-run smartStage so the same RUNTIME_EXCLUSION_PATHS apply.
// Snapshot commits used nativeAddTracked (git add -u) which stages
// ALL tracked modifications including .gsd/ state files. Without
// re-staging, those .gsd/ changes leak into the absorbed commit.
this.smartStage();
try {
nativeCommit(this.basePath, headMessage, { allowEmpty: false });
} catch {