0ct0pu5/runtipi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: add git pull strategy

Browse source
This commit is contained in:
Nicolas Meienberger 2023-08-31 21:05:13 +02:00
parent d4adfaafb3
commit ed0b10c5dc
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/cli/src/executors/repo/repo.executors.ts
View file

@ -81,6 +81,13 @@ export class RepoExecutors {
this.logger.info(`stdout: ${stdout}`);
});
// git config pull.rebase false
await execAsync(`git -C ${repoPath} config pull.rebase false`).then(({ stdout, stderr }) => {
this.logger.info(`------------------ git -C ${repoPath} config pull.rebase false ------------------`);
this.logger.error(`stderr: ${stderr}`);
this.logger.info(`stdout: ${stdout}`);
});
// reset hard
await execAsync(`git -C ${repoPath} reset --hard`).then(({ stdout, stderr }) => {
this.logger.info(`------------------ git -C ${repoPath} reset --hard ------------------`);