From cb28e1a6a0ceede54d6fa9a2397ef3a87cdc327b Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Wed, 23 Dec 2020 00:34:12 +0100
Subject: [PATCH] chore(git): Need author and commiter for doing git merge

---
 packages/backend-common/src/scm/git.ts  | 13 ++++++++++++-
 packages/techdocs-common/src/helpers.ts |  5 +++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/backend-common/src/scm/git.ts b/packages/backend-common/src/scm/git.ts
index b744040cb2..871a623b19 100644
--- a/packages/backend-common/src/scm/git.ts
+++ b/packages/backend-common/src/scm/git.ts
@@ -148,16 +148,27 @@ class SCM {
     dir,
     headBranch,
     baseBranch,
+    author,
+    committer,
   }: {
     dir: string;
     headBranch: string;
     baseBranch?: string;
+    author: { name: string; email: string };
+    committer: { name: string; email: string };
   }) {
     this.config.logger?.info(
       `Merging branch '${headBranch}' into '${baseBranch}' for repository {dir=${dir}}`,
     );
     // If baseBranch is undefined, current branch is used.
-    return git.merge({ fs, dir, ours: baseBranch, theirs: headBranch });
+    return git.merge({
+      fs,
+      dir,
+      ours: baseBranch,
+      theirs: headBranch,
+      author,
+      committer,
+    });
   }
 
   async push({ dir, remoteName }: { dir: string; remoteName: string }) {
diff --git a/packages/techdocs-common/src/helpers.ts b/packages/techdocs-common/src/helpers.ts
index 749c91adc0..9685218bfa 100644
--- a/packages/techdocs-common/src/helpers.ts
+++ b/packages/techdocs-common/src/helpers.ts
@@ -168,6 +168,11 @@ export const checkoutGitRepository = async (
         dir: repositoryTmpPath,
         headBranch: `origin/${currentBranchName}`,
         baseBranch: currentBranchName || undefined,
+        author: { name: 'Backstage TechDocs', email: 'techdocs@backstage.io' },
+        committer: {
+          name: 'Backstage TechDocs',
+          email: 'techdocs@backstage.io',
+        },
       });
       return repositoryTmpPath;
     } catch (e) {