fix: support submodules when commit signing (#3354)

* fix: support submodules when commit signing

* create correct tree object for submodule

* update log messages

src/git-command-manager.ts

@@ -14,6 +14,7 @@ export type Commit = {
   body: string
   changes: {
     mode: string
+    dstSha: string
     status: 'A' | 'M' | 'D'
     path: string
   }[]
@@ -178,13 +179,14 @@ export class GitCommandManager {
       body: detailLines.slice(5, endOfBodyIndex).join('\n'),
       changes: lines.slice(endOfBodyIndex + 2, -1).map(line => {
         const change = line.match(
-          /^:(\d{6}) (\d{6}) \w{40} \w{40} ([AMD])\s+(.*)$/
+          /^:(\d{6}) (\d{6}) \w{40} (\w{40}) ([AMD])\s+(.*)$/
         )
         if (change) {
           return {
-            mode: change[3] === 'D' ? change[1] : change[2],
-            status: change[3],
-            path: change[4]
+            mode: change[4] === 'D' ? change[1] : change[2],
+            dstSha: change[3],
+            status: change[4],
+            path: change[5]
           }
         } else {
           unparsedChanges.push(line)

src/github-helper.ts

@@ -35,7 +35,7 @@ type TreeObject = {
   path: string
   mode: '100644' | '100755' | '040000' | '160000' | '120000'
   sha: string | null
-  type: 'blob'
+  type: 'blob' | 'commit'
 }
 
 export class GitHubHelper {
@@ -255,31 +255,44 @@ export class GitHubHelper {
     if (commit.changes.length > 0) {
       core.info(`Creating tree objects for local commit ${commit.sha}`)
       const treeObjects = await Promise.all(
-        commit.changes.map(async ({path, mode, status}) => {
-          let sha: string | null = null
-          if (status === 'A' || status === 'M') {
-            try {
-              const {data: blob} = await blobCreationLimit(() =>
-                this.octokit.rest.git.createBlob({
-                  ...repository,
-                  content: utils.readFileBase64([repoPath, path]),
-                  encoding: 'base64'
-                })
-              )
-              sha = blob.sha
-            } catch (error) {
-              core.error(
-                `Error creating blob for file '${path}': ${utils.getErrorMessage(error)}`
-              )
-              throw error
+        commit.changes.map(async ({path, mode, status, dstSha}) => {
+          if (mode === '160000') {
+            // submodule
+            core.info(`Creating tree object for submodule commit at '${path}'`)
+            return <TreeObject>{
+              path,
+              mode,
+              sha: dstSha,
+              type: 'commit'
+            }
+          } else {
+            let sha: string | null = null
+            if (status === 'A' || status === 'M') {
+              try {
+                const {data: blob} = await blobCreationLimit(() =>
+                  this.octokit.rest.git.createBlob({
+                    ...repository,
+                    content: utils.readFileBase64([repoPath, path]),
+                    encoding: 'base64'
+                  })
+                )
+                sha = blob.sha
+              } catch (error) {
+                core.error(
+                  `Error creating blob for file '${path}': ${utils.getErrorMessage(error)}`
+                )
+                throw error
+              }
+            }
+            core.info(
+              `Creating tree object for blob at '${path}' with status '${status}'`
+            )
+            return <TreeObject>{
+              path,
+              mode,
+              sha,
+              type: 'blob'
             }
-          }
-          core.info(`Created blob for file '${path}'`)
-          return <TreeObject>{
-            path,
-            mode,
-            sha,
-            type: 'blob'
           }
         })
       )