Update pull with stash command

Author: zaknafeyn

src/commands/checkoutToCommand/index.ts

@@ -297,7 +297,7 @@ export class CheckoutToCommand extends BaseCommand {
     try {
       if (isWorkdirHasChanges) {
         const stashMessage = getStashMessage(currentBranch);
-        await git.createStash(stashMessage, true);
+        await git.createStash(stashMessage);
       }
     } catch (e) {
       if (e instanceof Error) {
@@ -350,7 +350,7 @@ export class CheckoutToCommand extends BaseCommand {
 
     try {
       if (isWorkdirHasChanges) {
-        await git.createStash(stashMessage, true);
+        await git.createStash(stashMessage);
       }
     } catch (e) {
       if (e instanceof Error) {

src/commands/pullWithStashCommand/index.ts

@@ -18,16 +18,24 @@ export class PullWithStashCommand extends BaseCommand {
     const currentBranch = await git.getCurrentBranch();
     const stashMessage = getStashMessage(currentBranch, true);
     // stash
-    const isWorkdirHasChanges = await git.isWorkdirHasChanges();
-    if (isWorkdirHasChanges) {
-      await git.createStash(stashMessage, true);
+    const isWorkdirHasChangesBeforeStash = await git.isWorkdirHasChanges();
+    if (isWorkdirHasChangesBeforeStash) {
+      await git.createStash(stashMessage);
     }
 
     // pull
     await git.pullFromRemoteBranch();
 
     // pop latest stash
-    if (isWorkdirHasChanges) {
+    if (isWorkdirHasChangesBeforeStash) {
+      // check for auto generated files that running application might generate after pull
+      const isWorkdirHasChanges = await git.isWorkdirHasChanges();
+      if (isWorkdirHasChanges) {
+        // if such changes present, reset them
+        await git.resetLocalChanges();
+      }
+
+      // .. proceed to stash pop
       await git.popStash(stashMessage);
     }
   }

src/common/git/gitExecutor.ts

@@ -84,8 +84,14 @@ export class GitExecutor {
     return stdout;
   }
 
-  async createStash(stashName: string, includeUntracked: boolean) {
-    const command = `git stash push -m "${stashName}" ${includeUntracked ? '-u' : ''}`;
+  async createStash(stashName: string, include: 'all' | 'untracked' | 'none' = 'untracked') {
+    const commandArr = [
+      `git stash push -m "${stashName}"`,
+      ...(include === 'all' ? ['-a'] : []),
+      ...(include === 'untracked' ? ['-u'] : []),
+    ];
+
+    const command = commandArr.join(' ');
 
     const { stdout } = await this.#execGitCommand(command);
 
@@ -94,6 +100,13 @@ export class GitExecutor {
     }
   }
 
+  async resetLocalChanges() {
+    // Discard all local changes
+    const command = 'git restore .';
+
+    await this.#execGitCommand(command);
+  }
+
   async getAllRefListExtended(fetchRemotes = false): Promise<IGitRef[]> {
     if (fetchRemotes) {
       await this.fetchAllRemoteBranchesAndTags();