From d103a48fa306d745599dc0c793668c9e6a479d32 Mon Sep 17 00:00:00 2001
From: RJ Decilos III <rjde@simcorp.com>
Date: Fri, 4 Oct 2024 11:11:37 +0800
Subject: [PATCH 1/3] fix: createBranch gitHelper function

Signed-off-by: RJ Decilos III <decilos_rj@yahoo.com>
---
 plugins/scaffolder-node/src/actions/gitHelpers.test.ts | 5 +++--
 plugins/scaffolder-node/src/actions/gitHelpers.ts      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/scaffolder-node/src/actions/gitHelpers.test.ts b/plugins/scaffolder-node/src/actions/gitHelpers.test.ts
index 85fb9ba2e6..7a61e592ec 100644
--- a/plugins/scaffolder-node/src/actions/gitHelpers.test.ts
+++ b/plugins/scaffolder-node/src/actions/gitHelpers.test.ts
@@ -32,6 +32,7 @@ jest.mock('../scm', () => ({
       init: jest.fn(),
       add: jest.fn(),
       checkout: jest.fn(),
+      branch: jest.fn(),
       commit: jest
         .fn()
         .mockResolvedValue('220f19cc36b551763d157f1b5e4a4b446165dbd6'),
@@ -444,7 +445,7 @@ describe('createBranch', () => {
     });
 
     it('create the branch', () => {
-      expect(mockedGit.checkout).toHaveBeenCalledWith({
+      expect(mockedGit.branch).toHaveBeenCalledWith({
         ref: 'trunk',
         dir: '/tmp/repo/dir/',
       });
@@ -460,7 +461,7 @@ describe('createBranch', () => {
       },
     });
 
-    expect(mockedGit.checkout).toHaveBeenCalledWith({
+    expect(mockedGit.branch).toHaveBeenCalledWith({
       ref: 'trunk',
       dir: '/tmp/repo/dir/',
     });
diff --git a/plugins/scaffolder-node/src/actions/gitHelpers.ts b/plugins/scaffolder-node/src/actions/gitHelpers.ts
index 04f47d1648..9f2d5709a7 100644
--- a/plugins/scaffolder-node/src/actions/gitHelpers.ts
+++ b/plugins/scaffolder-node/src/actions/gitHelpers.ts
@@ -178,7 +178,7 @@ export async function createBranch(options: {
     logger,
   });
 
-  await git.checkout({ dir, ref });
+  await git.branch({ dir, ref });
 }
 
 /**

From d7a736cc6acbc36dd051fc0ffce4a51a0bed1adf Mon Sep 17 00:00:00 2001
From: RJ Decilos III <decilos_rj@yahoo.com>
Date: Fri, 4 Oct 2024 14:46:26 +0800
Subject: [PATCH 2/3] chore: create changeset

Signed-off-by: RJ Decilos III <decilos_rj@yahoo.com>
---
 .changeset/thick-tables-give.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/thick-tables-give.md

diff --git a/.changeset/thick-tables-give.md b/.changeset/thick-tables-give.md
new file mode 100644
index 0000000000..8fe55346b9
--- /dev/null
+++ b/.changeset/thick-tables-give.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-node': patch
+---
+
+Use Git class' branch function instead of checkout function when creating branch

From 11299d488c0eda7137c9c0bf112e087e87e9ea4f Mon Sep 17 00:00:00 2001
From: Ben Lambert <ben@blam.sh>
Date: Mon, 7 Oct 2024 13:09:35 +0200
Subject: [PATCH 3/3] Update thick-tables-give.md

Signed-off-by: Ben Lambert <ben@blam.sh>
---
 .changeset/thick-tables-give.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/thick-tables-give.md b/.changeset/thick-tables-give.md
index 8fe55346b9..e6b4026e51 100644
--- a/.changeset/thick-tables-give.md
+++ b/.changeset/thick-tables-give.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-node': patch
 ---
 
-Use Git class' branch function instead of checkout function when creating branch
+Use `branch` function instead of `checkout` function when creating branch