fix: windows conversion is cached before detectFileMoves

forcedotcom · Jul 18, 2024 · c6f54ab · c6f54ab
1 parent c91bde7
commit c6f54ab
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/shared/local/localShadowRepo.ts b/src/shared/local/localShadowRepo.ts
@@ -153,6 +153,11 @@ export class ShadowRepo {
           filter: fileFilter(this.packageDirs),
         });
 
+        // isomorphic-git stores things in unix-style tree.  Convert to windows-style if necessary
+        if (IS_WINDOWS) {
+          this.status = this.status.map((row) => [path.normalize(row[FILE]), row[HEAD], row[WORKDIR], row[3]]);
+        }
+
         // Check for moved files and update local git status accordingly
         if (env.getBoolean('SF_BETA_TRACK_FILE_MOVES') === true) {
           await Lifecycle.getInstance().emitTelemetry({ eventName: 'moveFileDetectionEnabled' });
@@ -165,10 +170,7 @@ export class ShadowRepo {
       } catch (e) {
         redirectToCliRepoError(e);
       }
-      // isomorphic-git stores things in unix-style tree.  Convert to windows-style if necessary
-      if (IS_WINDOWS) {
-        this.status = this.status.map((row) => [path.normalize(row[FILE]), row[HEAD], row[WORKDIR], row[3]]);
-      }
+
       marker?.stop();
     }
     this.logger.trace(`done: getStatus (noCache = ${noCache})`);