From 443465a8051c89e83b48d1aa2273dfe13b8e2e94 Mon Sep 17 00:00:00 2001
From: Louis Jimenez <louisjimenez@google.com>
Date: Tue, 17 Jun 2025 22:01:42 -0400
Subject: Clear out untracked files when restoring a checkpoint (#1139)

---
 packages/core/src/services/gitService.ts | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages/core/src')

diff --git a/packages/core/src/services/gitService.ts b/packages/core/src/services/gitService.ts
index 38c1c378..956dcec0 100644
--- a/packages/core/src/services/gitService.ts
+++ b/packages/core/src/services/gitService.ts
@@ -110,5 +110,7 @@ export class GitService {
   async restoreProjectFromSnapshot(commitHash: string): Promise<void> {
     const repo = this.shadowGitRepository;
     await repo.raw(['restore', '--source', commitHash, '.']);
+    // Removes any untracked files that were introduced post snapshot.
+    await repo.clean('f', ['-d']);
   }
 }
-- 
cgit v1.2.3