fix(core): handle file renames properly for affected (#15340)

e2e/nx-run/src/affected-graph.test.ts

@@ -180,8 +180,6 @@ describe('Nx Affected and Graph Tests', () => {
       mylib = uniq('mylib');
       const nxJson: NxJsonConfiguration = readJson('nx.json');
 
-      delete nxJson.implicitDependencies;
-
       updateFile('nx.json', JSON.stringify(nxJson));
       runCommand(`git init`);
       runCommand(`git config user.email "[email protected]"`);
@@ -266,6 +264,24 @@ describe('Nx Affected and Graph Tests', () => {
         implicitDependencies: [],
       }));
     });
+
+    it('should handle file renames', () => {
+      generateAll();
+
+      // Move file
+      updateFile(
+        `apps/${myapp2}/src/index.html`,
+        readFile(`apps/${myapp}/src/index.html`)
+      );
+      removeFile(`apps/${myapp}/src/index.html`);
+
+      const affectedProjects = runCLI(
+        'print-affected --uncommitted --select projects'
+      ).split(', ');
+
+      expect(affectedProjects).toContain(myapp);
+      expect(affectedProjects).toContain(myapp2);
+    });
   });
 
   describe('print-affected', () => {

packages/nx/src/utils/command-line-utils.ts

@@ -222,7 +222,7 @@ export function parseFiles(options: NxArgs): { files: string[] } {
 }
 
 function getUncommittedFiles(): string[] {
-  return parseGitOutput(`git diff --name-only --relative HEAD .`);
+  return parseGitOutput(`git diff --name-only --no-renames --relative HEAD .`);
 }
 
 ``;
@@ -249,7 +249,7 @@ function getFilesUsingBaseAndHead(base: string, head: string): string[] {
       .trim();
   }
   return parseGitOutput(
-    `git diff --name-only --relative "${mergeBase}" "${head}"`
+    `git diff --name-only --no-renames --relative "${mergeBase}" "${head}"`
   );
 }