update test and handle diff status for legacy git

Kong · Mar 7, 2025 · 639ffdf · 639ffdf
1 parent 35f4669
commit 639ffdf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/packages/insomnia/src/main/git-service.ts b/packages/insomnia/src/main/git-service.ts
@@ -187,6 +187,7 @@ export async function loadGitRepository({
         fs: fsClient,
         gitDirectory: GIT_INTERNAL_DIR,
         gitCredentials: credentials,
+        legacyDiff: Boolean(workspaceId),
       });
     }
 
@@ -849,6 +850,7 @@ export const cloneGitRepoAction = async ({
           fs: routableFS,
           gitDirectory: GIT_INTERNAL_DIR,
           gitCredentials: gitRepository.credentials,
+          legacyDiff: true,
         });
       }
 

diff --git a/packages/insomnia/src/sync/git/__tests__/git-vcs.test.ts b/packages/insomnia/src/sync/git/__tests__/git-vcs.test.ts
@@ -30,6 +30,7 @@ describe('Git-VCS', () => {
         repoId: '',
         directory: GIT_CLONE_DIR,
         fs: fsClient,
+        legacyDiff: true,
       });
       await GitVCS.setAuthor('Karen Brown', '[email protected]');
 
@@ -109,6 +110,7 @@ describe('Git-VCS', () => {
         repoId: '',
         directory: GIT_CLONE_DIR,
         fs: fsClient,
+        legacyDiff: true,
       });
       await GitVCS.setAuthor('Karen Brown', '[email protected]');
       expect(await GitVCS.log()).toEqual([]);
@@ -126,6 +128,7 @@ describe('Git-VCS', () => {
         repoId: '',
         directory: GIT_CLONE_DIR,
         fs: fsClient,
+        legacyDiff: true,
       });
 
       await GitVCS.setAuthor('Karen Brown', '[email protected]');
@@ -212,6 +215,7 @@ First commit!
         repoId: '',
         directory: GIT_CLONE_DIR,
         fs: fsClient,
+        legacyDiff: true,
       });
       await GitVCS.setAuthor('Karen Brown', '[email protected]');
       const status = await GitVCS.status();
@@ -260,6 +264,7 @@ First commit!
         repoId: '',
         directory: GIT_CLONE_DIR,
         fs: fsClient,
+        legacyDiff: true,
       });
       // Commit
       await GitVCS.setAuthor('Karen Brown', '[email protected]');
@@ -318,6 +323,7 @@ First commit!
         repoId: '',
         directory: GIT_CLONE_DIR,
         fs: fsClient,
+        legacyDiff: true,
       });
       // Write to all files
       await Promise.all(files.map(f => fsClient.promises.writeFile(f, originalContent)));

diff --git a/packages/insomnia/src/sync/git/git-vcs.ts b/packages/insomnia/src/sync/git/git-vcs.ts
@@ -69,6 +69,7 @@ interface InitOptions {
   gitCredentials?: GitCredentials | null;
   uri?: string;
   repoId: string;
+  legacyDiff?: boolean;
 }
 
 interface InitFromCloneOptions {
@@ -118,13 +119,14 @@ interface BaseOpts {
   onAuth: git.AuthCallback;
   uri: string;
   repoId: string;
+  legacyDiff?: boolean;
 }
 
 export class GitVCS {
   // @ts-expect-error -- TSCONVERSION not initialized with required properties
   _baseOpts: BaseOpts = gitCallbacks();
 
-  async init({ directory, fs, gitDirectory, gitCredentials, uri = '', repoId }: InitOptions) {
+  async init({ directory, fs, gitDirectory, gitCredentials, uri = '', repoId, legacyDiff = false }: InitOptions) {
     this._baseOpts = {
       ...this._baseOpts,
       dir: directory,
@@ -134,6 +136,7 @@ export class GitVCS {
       http: httpClient,
       uri,
       repoId,
+      legacyDiff,
     };
 
     if (await this.repoExists()) {
@@ -418,6 +421,13 @@ export class GitVCS {
         git.STAGE(),
       ],
       map: async function map(filepath, [head, workdir, stage]) {
+        if (baseOpts.legacyDiff) {
+          const isInsomniaFile = filepath.startsWith(GIT_INSOMNIA_DIR_NAME) || filepath.startsWith('insomnia.') || filepath === '.';
+          if (!isInsomniaFile) {
+            return null;
+          }
+        }
+
         if (await git.isIgnored({
           ...baseOpts,
           filepath,