Prefer --find-renames over -M

paleite · Jul 19, 2022 · d03599a · d03599a
1 parent 7727a9b
commit d03599a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/__fixtures__/postprocessArguments.ts b/src/__fixtures__/postprocessArguments.ts
@@ -1,6 +1,9 @@
 import type { Linter } from "eslint";
 
-const postprocessArguments: [Linter.LintMessage[][], string] = [
+const postprocessArguments: [
+  [[Linter.LintMessage, ...Linter.LintMessage[]], ...Linter.LintMessage[][]],
+  string
+] = [
   [
     [
       {

diff --git a/src/git.test.ts b/src/git.test.ts
@@ -56,7 +56,7 @@ describe("getDiffForFile", () => {
 
     const expectedCommand = "git";
     const expectedArgs =
-      'diff --no-ext-diff --diff-algorithm=histogram --diff-filter=ACM -M100% --relative --staged --unified=0 1234567';
+      "diff --diff-algorithm=histogram --diff-filter=ACM --find-renames=100% --no-ext-diff --relative --staged --unified=0 1234567";
 
     const lastCall = mockedChildProcess.execFileSync.mock.calls.at(-1);
     const [command, argsIncludingFile = []] = lastCall ?? [""];

diff --git a/src/git.ts b/src/git.ts
@@ -7,10 +7,10 @@ const COMMAND = "git";
 const getDiffForFile = (filePath: string, staged = false): string => {
   const args = [
     "diff",
-    "--no-ext-diff",
     "--diff-algorithm=histogram",
     "--diff-filter=ACM",
-    "-M100%",
+    "--find-renames=100%",
+    "--no-ext-diff",
     "--relative",
     staged && "--staged",
     "--unified=0",
@@ -28,11 +28,11 @@ const getDiffForFile = (filePath: string, staged = false): string => {
 const getDiffFileList = (): string[] => {
   const args = [
     "diff",
-    "--no-ext-diff",
     "--diff-algorithm=histogram",
     "--diff-filter=ACM",
-    "-M100%",
+    "--find-renames=100%",
     "--name-only",
+    "--no-ext-diff",
     "--relative",
     "--staged",
     process.env.ESLINT_PLUGIN_DIFF_COMMIT ?? "HEAD",