From 973be7640e302a1add8274dfa5325bdc52ef4ba1 Mon Sep 17 00:00:00 2001 From: Smartsheet-JB-Brown Date: Sat, 12 Apr 2025 10:22:33 -0700 Subject: [PATCH] working mvp --- src/services/package-manager/GitFetcher.ts | 4 ++-- src/services/package-manager/__tests__/GitFetcher.test.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/services/package-manager/GitFetcher.ts b/src/services/package-manager/GitFetcher.ts index 62b269e324..b28dd78d2a 100644 --- a/src/services/package-manager/GitFetcher.ts +++ b/src/services/package-manager/GitFetcher.ts @@ -92,7 +92,7 @@ export class GitFetcher { // Force pull with overwrite await git.fetch("origin", "main") await git.raw(["reset", "--hard", "origin/main"]) - await git.clean(["--force", "-d"]) + await git.raw(["clean", "-f", "-d"]) } catch (error) { // If pull fails with specific errors that indicate repo corruption, // we should remove and re-clone @@ -133,7 +133,7 @@ export class GitFetcher { await git.clone(repoUrl, repoDir) // Reset to ensure clean state const repoGit = simpleGit(repoDir) - await repoGit.clean(["--force", "-d"]) + await repoGit.raw(["clean", "-f", "-d"]) await repoGit.raw(["reset", "--hard", "HEAD"]) } catch (error) { // If clone fails, ensure we clean up any partially created directory diff --git a/src/services/package-manager/__tests__/GitFetcher.test.ts b/src/services/package-manager/__tests__/GitFetcher.test.ts index b5f0ccd530..294e09349d 100644 --- a/src/services/package-manager/__tests__/GitFetcher.test.ts +++ b/src/services/package-manager/__tests__/GitFetcher.test.ts @@ -121,7 +121,7 @@ describe("GitFetcher", () => { const mockGit = mockSimpleGit() expect(mockGit.clone).toHaveBeenCalledWith(testRepoUrl, testRepoDir) - expect(mockGit.clean).toHaveBeenCalledWith(["--force", "-d"]) + expect(mockGit.raw).toHaveBeenCalledWith(["clean", "-f", "-d"]) expect(mockGit.raw).toHaveBeenCalledWith(["reset", "--hard", "HEAD"]) }) @@ -139,7 +139,7 @@ describe("GitFetcher", () => { const mockGit = mockSimpleGit() expect(mockGit.fetch).toHaveBeenCalledWith("origin", "main") expect(mockGit.raw).toHaveBeenCalledWith(["reset", "--hard", "origin/main"]) - expect(mockGit.clean).toHaveBeenCalledWith(["--force", "-d"]) + expect(mockGit.raw).toHaveBeenCalledWith(["clean", "-f", "-d"]) expect(mockGit.clone).not.toHaveBeenCalled() }) @@ -197,7 +197,7 @@ describe("GitFetcher", () => { // Second rm call is after pull failure expect(fs.rm).toHaveBeenCalledWith(testRepoDir, { recursive: true, force: true }) expect(mockGit.clone).toHaveBeenCalledWith(testRepoUrl, testRepoDir) - expect(mockGit.clean).toHaveBeenCalledWith(["--force", "-d"]) + expect(mockGit.raw).toHaveBeenCalledWith(["clean", "-f", "-d"]) expect(mockGit.raw).toHaveBeenCalledWith(["reset", "--hard", "HEAD"]) })