fix(tldr.ts): replace git pull with git fetch and git reset

lonr · Nov 28, 2023 · 1efc9c9 · 1efc9c9
1 parent 98ec2f4
commit 1efc9c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/cli.ts b/src/cli.ts
@@ -9,7 +9,7 @@ export { pkg };
 export type PKG = typeof pkg;
 
 // handwrite the version as `package.json` will be inlined by rollup
-pkg.version = '1.1.4';
+pkg.version = '1.1.6';
 const SPEC_VERSION = '1.5';
 const PAGES_REPO = 'https://github.com/tldr-pages/tldr';
 const ROOT_DIR = fileURLToPath(new URL('../', import.meta.url));

diff --git a/src/tldr.ts b/src/tldr.ts
@@ -61,7 +61,8 @@ export class Tldr {
 
   private async pull() {
     console.log('Updating pages...');
-    await exec('git pull', { cwd: this.dir });
+    await exec('git fetch', { cwd: this.dir });
+    await exec('git reset --hard origin/main', { cwd: this.dir });
     console.log('Pages updated');
   }