Add git pull autostash

mieweb · May 6, 2024 · 8c0c79f · 8c0c79f
1 parent 718f0d8
commit 8c0c79f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/git/GitScanner.ts b/src/git/GitScanner.ts
@@ -211,7 +211,7 @@ export class GitScanner {
       remoteBranch = 'master';
     }
 
-    await this.exec(`git pull --rebase origin ${remoteBranch}:master`, {
+    await this.exec(`git pull --autostash --rebase origin ${remoteBranch}:master`, {
       env: {
         GIT_SSH_COMMAND: sshParams?.privateKeyFile ? `ssh -i ${sanitize(sshParams.privateKeyFile)} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes` : undefined
       }