fix: the merging can not sign the commit (#1235)

* fix: the merging can not sign the commit * docs: add @snowyu as a contributor Co-authored-by: Jakub T. Jankiewicz <jcubic@onet.pl>
isomorphic-git · Jul 5, 2021 · 6af05bd · 6af05bd
1 parent 1d63afe
commit 6af05bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/api/merge.js b/src/api/merge.js
@@ -118,6 +118,7 @@ export async function merge({
       author,
       committer,
       signingKey,
+      onSign,
     })
   } catch (err) {
     err.caller = 'git.merge'

diff --git a/src/commands/merge.js b/src/commands/merge.js
@@ -44,6 +44,7 @@ import { mergeTree } from '../utils/mergeTree.js'
  * @param {number} args.committer.timestamp
  * @param {number} args.committer.timezoneOffset
  * @param {string} [args.signingKey]
+ * @param {SignCallback} [args.onSign] - a PGP signing implementation
  *
  * @returns {Promise<MergeResult>} Resolves to a description of the merge operation
  *
@@ -61,6 +62,7 @@ export async function _merge({
   author,
   committer,
   signingKey,
+  onSign,
 }) {
   if (ours === undefined) {
     ours = await _currentBranch({ fs, gitdir, fullname: true })
@@ -145,6 +147,7 @@ export async function _merge({
       author,
       committer,
       signingKey,
+      onSign,
       dryRun,
       noUpdateBranch,
     })