fix: error getting diff for submodules (#1473)

Co-authored-by: GitHub Action <action@github.com>
tj-actions · Aug 23, 2023 · 17f3fec · 17f3fec
1 parent 52dbf3e
commit 17f3fec
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 19 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/changedFiles.ts b/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

diff --git a/src/main.ts b/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'
     ]