From 19eb8e206616c6a9d3ad1dc2f4378574cc0de277 Mon Sep 17 00:00:00 2001
From: "Lukas Fruntke (external expert on behalf of DB Netz)"
 <lukas.fruntke-extern@deutschebahn.com>
Date: Wed, 5 Apr 2023 10:39:15 +0200
Subject: [PATCH] Adress review comments

Signed-off-by: Lukas Fruntke (external expert on behalf of DB Netz) <lukas.fruntke-extern@deutschebahn.com>
---
 .changeset/dull-birds-lie.md            | 2 +-
 .changeset/quick-plants-live.md         | 4 ++--
 packages/backend-common/package.json    | 2 +-
 packages/backend-common/src/scm/git.ts  | 2 +-
 plugins/scaffolder-backend/package.json | 2 +-
 yarn.lock                               | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.changeset/dull-birds-lie.md b/.changeset/dull-birds-lie.md
index addb988fb8..5f8049a85e 100644
--- a/.changeset/dull-birds-lie.md
+++ b/.changeset/dull-birds-lie.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-backend': minor
 ---
 
-**BREAKING** The non-PR/MR Git Actions now return the commitHash of the commit pushed as a new output called `commitHash`
+The non-PR/MR Git Actions now return the commit hash of the commit pushed as a new output called `commitHash`, isomorphic-git is now on version 1.23.0
diff --git a/.changeset/quick-plants-live.md b/.changeset/quick-plants-live.md
index 0cfba91314..5263d4c2fb 100644
--- a/.changeset/quick-plants-live.md
+++ b/.changeset/quick-plants-live.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/backend-common': minor
+'@backstage/backend-common': patch
 ---
 
-**BREAKING** The git commit helper now returns the commitHash of the commit created
+The dependency isomorphic-git is now on version 1.23.0
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 373d664aa9..4082089a08 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -82,7 +82,7 @@
     "fs-extra": "10.1.0",
     "git-url-parse": "^13.0.0",
     "helmet": "^6.0.0",
-    "isomorphic-git": "^1.21.0",
+    "isomorphic-git": "^1.23.0",
     "jose": "^4.6.0",
     "keyv": "^4.5.2",
     "knex": "^2.0.0",
diff --git a/packages/backend-common/src/scm/git.ts b/packages/backend-common/src/scm/git.ts
index 8317c77d1e..234ae57d30 100644
--- a/packages/backend-common/src/scm/git.ts
+++ b/packages/backend-common/src/scm/git.ts
@@ -111,7 +111,7 @@ export class Git {
     this.config.logger?.info(
       `Committing file to repo {dir=${dir},message=${message}}`,
     );
-    return await git.commit({ fs, dir, message, author, committer });
+    return git.commit({ fs, dir, message, author, committer });
   }
 
   /** https://isomorphic-git.org/docs/en/clone */
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 97d4577d23..1e234feb37 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -78,7 +78,7 @@
     "git-url-parse": "^13.0.0",
     "globby": "^11.0.0",
     "isbinaryfile": "^5.0.0",
-    "isomorphic-git": "^1.8.0",
+    "isomorphic-git": "^1.23.0",
     "jsonschema": "^1.2.6",
     "knex": "^2.0.0",
     "lodash": "^4.17.21",
diff --git a/yarn.lock b/yarn.lock
index eb25118c8f..8ad5779546 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3525,7 +3525,7 @@ __metadata:
     git-url-parse: ^13.0.0
     helmet: ^6.0.0
     http-errors: ^2.0.0
-    isomorphic-git: ^1.21.0
+    isomorphic-git: ^1.23.0
     jose: ^4.6.0
     keyv: ^4.5.2
     knex: ^2.0.0
@@ -8031,7 +8031,7 @@ __metadata:
     git-url-parse: ^13.0.0
     globby: ^11.0.0
     isbinaryfile: ^5.0.0
-    isomorphic-git: ^1.8.0
+    isomorphic-git: ^1.23.0
     jest-when: ^3.1.0
     jsonschema: ^1.2.6
     knex: ^2.0.0
@@ -27103,7 +27103,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isomorphic-git@npm:^1.21.0, isomorphic-git@npm:^1.8.0":
+"isomorphic-git@npm:^1.23.0":
   version: 1.23.0
   resolution: "isomorphic-git@npm:1.23.0"
   dependencies: