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

fix(git): reset hard on remote branch before pulling

Browse source
This commit is contained in:
Nicolas Meienberger 2023-08-31 22:07:52 +02:00
parent b8be697e60
commit 3959fd8a1f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,8 +88,12 @@ export class RepoExecutors {
this.logger.info(`stdout: ${stdout}`);
});
const currentBranch = await execAsync(`git -C ${repoPath} rev-parse --abbrev-ref HEAD`).then(({ stdout }) => {
return stdout.trim();
});
// reset hard
await execAsync(`git -C ${repoPath} reset --hard`).then(({ stdout, stderr }) => {
await execAsync(`git fetch origin && git -C ${repoPath} reset --hard origin/${currentBranch}`).then(({ stdout, stderr }) => {
this.logger.info(`------------------ git -C ${repoPath} reset --hard ------------------`);
this.logger.error(`stderr: ${stderr}`);
this.logger.info(`stdout: ${stdout}`);