fix(onboarding): force branch creation to prevent diff-check (#21200)

renovatebot · Mar 28, 2023 · 874cfe8 · 874cfe8
1 parent 39493b7
commit 874cfe8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/workers/repository/onboarding/branch/create.spec.ts b/lib/workers/repository/onboarding/branch/create.spec.ts
@@ -27,6 +27,7 @@ describe('workers/repository/onboarding/branch/create', () => {
             contents: '{"foo":"bar"}',
           },
         ],
+        force: true,
         message: 'Add renovate.json',
         platformCommit: false,
       });
@@ -49,6 +50,7 @@ describe('workers/repository/onboarding/branch/create', () => {
             contents: '{"foo":"bar"}',
           },
         ],
+        force: true,
         message,
         platformCommit: false,
       });
@@ -72,6 +74,7 @@ describe('workers/repository/onboarding/branch/create', () => {
               contents: '{"foo":"bar"}',
             },
           ],
+          force: true,
           message,
           platformCommit: false,
         });
@@ -99,6 +102,7 @@ describe('workers/repository/onboarding/branch/create', () => {
               contents: '{"foo":"bar"}',
             },
           ],
+          force: true,
           message,
           platformCommit: false,
         });
@@ -123,6 +127,7 @@ describe('workers/repository/onboarding/branch/create', () => {
               contents: '{"foo":"bar"}',
             },
           ],
+          force: true,
           message,
           platformCommit: false,
         });
@@ -150,6 +155,7 @@ describe('workers/repository/onboarding/branch/create', () => {
               contents: '{"foo":"bar"}',
             },
           ],
+          force: true,
           message,
           platformCommit: false,
         });
@@ -175,6 +181,7 @@ describe('workers/repository/onboarding/branch/create', () => {
               contents: '{"foo":"bar"}',
             },
           ],
+          force: true,
           message,
           platformCommit: false,
         });
@@ -198,6 +205,7 @@ describe('workers/repository/onboarding/branch/create', () => {
               contents: '{"foo":"bar"}',
             },
           ],
+          force: true,
           message,
           platformCommit: false,
         });
@@ -222,6 +230,7 @@ describe('workers/repository/onboarding/branch/create', () => {
               contents: '{"foo":"bar"}',
             },
           ],
+          force: true,
           message,
           platformCommit: false,
         });
@@ -241,6 +250,7 @@ describe('workers/repository/onboarding/branch/create', () => {
           branchName: 'renovate/configure',
           files: [{ type: 'addition', path, contents: '{"foo":"bar"}' }],
           message,
+          force: true,
           platformCommit: false,
         });
       });

diff --git a/lib/workers/repository/onboarding/branch/create.ts b/lib/workers/repository/onboarding/branch/create.ts
@@ -46,5 +46,6 @@ export async function createOnboardingBranch(
     ],
     message: commitMessage.toString(),
     platformCommit: !!config.platformCommit,
+    force: true,
   });
 }