fix: picking wrong commit to cherry-pick if submodule branch is alrea…

…dy up-to-date (#6)
wireapp · Apr 29, 2024 · a8da590 · a8da590
1 parent b042256
commit a8da590
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 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/git.ts b/src/git.ts
@@ -61,7 +61,8 @@ export async function fastForwardSubmodule(
     await gitExec([
         'commit',
         '-m',
-        `Update submodule ${submoduleName} to latest from ${targetBranch}`
+        `Update submodule ${submoduleName} to latest from ${targetBranch}`,
+        '--allow-empty'
     ])
     const commitSha = mergedPR.merge_commit_sha
     if (commitSha == null) {