fix: error getting diff for submodules (#1473)

Co-authored-by: GitHub Action <action@github.com>

dist/index.js

@@ -75,11 +75,20 @@ const getRenamedFiles = ({ inputs, workingDirectory, hasSubmodule, diffResult, s
             });
             const submoduleWorkingDirectory = path.join(workingDirectory, submodulePath);
             if (submoduleShaResult.currentSha && submoduleShaResult.previousSha) {
+                let diff = '...';
+                if (!(yield (0, utils_1.canDiffCommits)({
+                    cwd: submoduleWorkingDirectory,
+                    sha1: submoduleShaResult.previousSha,
+                    sha2: submoduleShaResult.currentSha,
+                    diff
+                }))) {
+                    diff = '..';
+                }
                 const submoduleRenamedFiles = yield (0, utils_1.gitRenamedFiles)({
                     cwd: submoduleWorkingDirectory,
                     sha1: submoduleShaResult.previousSha,
                     sha2: submoduleShaResult.currentSha,
-                    diff: diffResult.diff,
+                    diff,
                     oldNewSeparator: inputs.oldNewSeparator,
                     isSubmodule: true,
                     parentDir: submodulePath
@@ -130,11 +139,20 @@ const getAllDiffFiles = ({ workingDirectory, hasSubmodule, diffResult, submodule
             });
             const submoduleWorkingDirectory = path.join(workingDirectory, submodulePath);
             if (submoduleShaResult.currentSha && submoduleShaResult.previousSha) {
+                let diff = '...';
+                if (!(yield (0, utils_1.canDiffCommits)({
+                    cwd: submoduleWorkingDirectory,
+                    sha1: submoduleShaResult.previousSha,
+                    sha2: submoduleShaResult.currentSha,
+                    diff
+                }))) {
+                    diff = '..';
+                }
                 const submoduleFiles = yield (0, utils_1.getAllChangedFiles)({
                     cwd: submoduleWorkingDirectory,
                     sha1: submoduleShaResult.previousSha,
                     sha2: submoduleShaResult.currentSha,
-                    diff: diffResult.diff,
+                    diff,
                     isSubmodule: true,
                     parentDir: submodulePath,
                     outputRenamedFilesAsDeletedAndAdded
@@ -1572,19 +1590,12 @@ function run() {
                 'baseSha',
                 'since',
                 'until',
-                'path',
-                'quotePath',
-                'diffRelative',
                 'sinceLastRemoteCommit',
                 'recoverDeletedFiles',
                 'recoverDeletedFilesToDestination',
                 'recoverFiles',
-                'recoverFilesSeparator',
                 'recoverFilesIgnore',
-                'recoverFilesIgnoreSeparator',
                 'includeAllOldNewRenamedFiles',
-                'oldNewSeparator',
-                'oldNewFilesSeparator',
                 'skipInitialFetch'
             ];
             for (const input of unsupportedInputs) {

src/changedFiles.ts

@@ -8,6 +8,7 @@ import * as path from 'path'
 import {DiffResult} from './commitSha'
 import {Inputs} from './inputs'
 import {
+  canDiffCommits,
   getAllChangedFiles,
   getDirnameMaxDepth,
   getDirNamesIncludeFilesPattern,
@@ -54,11 +55,24 @@ export const getRenamedFiles = async ({
       )
 
       if (submoduleShaResult.currentSha && submoduleShaResult.previousSha) {
+        let diff = '...'
+
+        if (
+          !(await canDiffCommits({
+            cwd: submoduleWorkingDirectory,
+            sha1: submoduleShaResult.previousSha,
+            sha2: submoduleShaResult.currentSha,
+            diff
+          }))
+        ) {
+          diff = '..'
+        }
+
         const submoduleRenamedFiles = await gitRenamedFiles({
           cwd: submoduleWorkingDirectory,
           sha1: submoduleShaResult.previousSha,
           sha2: submoduleShaResult.currentSha,
-          diff: diffResult.diff,
+          diff,
           oldNewSeparator: inputs.oldNewSeparator,
           isSubmodule: true,
           parentDir: submodulePath
@@ -133,11 +147,24 @@ export const getAllDiffFiles = async ({
       )
 
       if (submoduleShaResult.currentSha && submoduleShaResult.previousSha) {
+        let diff = '...'
+
+        if (
+          !(await canDiffCommits({
+            cwd: submoduleWorkingDirectory,
+            sha1: submoduleShaResult.previousSha,
+            sha2: submoduleShaResult.currentSha,
+            diff
+          }))
+        ) {
+          diff = '..'
+        }
+
         const submoduleFiles = await getAllChangedFiles({
           cwd: submoduleWorkingDirectory,
           sha1: submoduleShaResult.previousSha,
           sha2: submoduleShaResult.currentSha,
-          diff: diffResult.diff,
+          diff,
           isSubmodule: true,
           parentDir: submodulePath,
           outputRenamedFilesAsDeletedAndAdded

src/main.ts

@@ -311,19 +311,12 @@ export async function run(): Promise<void> {
       'baseSha',
       'since',
       'until',
-      'path',
-      'quotePath',
-      'diffRelative',
       'sinceLastRemoteCommit',
       'recoverDeletedFiles',
       'recoverDeletedFilesToDestination',
       'recoverFiles',
-      'recoverFilesSeparator',
       'recoverFilesIgnore',
-      'recoverFilesIgnoreSeparator',
       'includeAllOldNewRenamedFiles',
-      'oldNewSeparator',
-      'oldNewFilesSeparator',
       'skipInitialFetch'
     ]