renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(gitFs): set explicit remote branch (#3229)

Browse source 
This pr fixes the windows specific git bug by setting the remove branch name explicitly when pushing.

Closes #3204
This commit is contained in:
Michael Kriese 2019-02-18 12:52:10 +01:00 committed by Rhys Arkins
parent 20a53ba7be
commit bb15977e39
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/platform/git/storage.js
View file

@ -271,7 +271,12 @@ class Storage {
} }
await git.add(files.map(f => f.name)); await git.add(files.map(f => f.name));
await git.commit(message); await git.commit(message);
await git.push(['origin', branchName, '--force']); await git.push([
'origin',
`${branchName}:${branchName}`,
'--force',
'-u',
]);
} catch (err) /* istanbul ignore next */ { } catch (err) /* istanbul ignore next */ {
logger.debug({ err }, 'Error commiting files'); logger.debug({ err }, 'Error commiting files');
if (err.message.includes('[remote rejected]')) { if (err.message.includes('[remote rejected]')) {