renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-13 15:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(git): git pull immediately after automerge (#10390)

Browse source 
Call git.pull() before performing a fetch, to handle the case where the default branch has been updated.

Closes #10372
This commit is contained in:
Rhys Arkins 2021-06-10 22:12:45 +02:00 committed by GitHub
parent 0e0f08b599
commit e1c7845dee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/util/git/index.ts
View file

@ -266,6 +266,7 @@ export async function syncGit(): Promise<void> {
try { try {
await git.raw(['remote', 'set-url', 'origin', config.url]); await git.raw(['remote', 'set-url', 'origin', config.url]);
await resetToBranch(await getDefaultBranch(git)); await resetToBranch(await getDefaultBranch(git));
await git.pull();
// istanbul ignore if // istanbul ignore if
if (process.env.NODE_ENV !== 'test') { if (process.env.NODE_ENV !== 'test') {
await git.raw(['config', '--unset-all', 'remote.origin.fetch']); await git.raw(['config', '--unset-all', 'remote.origin.fetch']);