diff --git a/lib/util/git/index.spec.ts b/lib/util/git/index.spec.ts index 63cd732cf2d1c50e08b11f9dbec5af3b918b7a74..de9da6eaa15603db410f3911bdfd68b18bee77f4 100644 --- a/lib/util/git/index.spec.ts +++ b/lib/util/git/index.spec.ts @@ -225,12 +225,6 @@ describe('util/git/index', () => { describe('mergeBranch(branchName)', () => { it('should perform a branch merge', async () => { - const repo = Git(GlobalConfig.get('localDir')); - await repo.checkout([ - '-B', - 'renovate/future_branch', - 'origin/renovate/future_branch', - ]); await git.mergeBranch('renovate/future_branch'); const merged = await Git(origin.path).branch([ '--verbose', diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts index 43ff10a7c359adda2488ca6895fc781d3805b886..8ead25335092fd31d1106dfc723753ead030f164 100644 --- a/lib/util/git/index.ts +++ b/lib/util/git/index.ts @@ -610,6 +610,7 @@ export async function mergeBranch(branchName: string): Promise<void> { try { await syncGit(); await git.reset(ResetMode.HARD); + await git.checkout(['-B', branchName, 'origin/' + branchName]); await git.checkout([ '-B', config.currentBranch,