Merge pull request #26963 from rjdecilos/fix/createbranch-githelper

Fix/createbranch githelper

.changeset/thick-tables-give.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-node': patch
+---
+
+Use `branch` function instead of `checkout` function when creating branch

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/',
     });

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 });
 }
 
 /**