fix: try applying unstaged changes before handling errors

lint-staged · Oct 31, 2019 · 080f1c6 · 080f1c6
1 parent 31e440e
commit 080f1c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/runAll.js b/src/runAll.js
@@ -114,17 +114,19 @@ https://github.com/okonet/lint-staged#using-js-functions-to-customize-linter-com
         title: 'Running tasks...',
         task: () => new Listr(tasks, { ...listrOptions, concurrent: true, exitOnError: false })
       },
+      {
+        title: 'Applying unstaged changes...',
+        skip: ctx => ctx.hasErrors && 'Skipped because of errors from tasks',
+        task: () => git.restoreUnstagedChanges()
+      },
       {
         title: 'Restoring original state due to errors...',
         enabled: ctx => ctx.hasErrors,
         task: () => git.restoreOriginalState()
       },
       {
         title: 'Cleaning up...',
-        task: async ctx => {
-          if (!ctx.hasErrors) await git.restoreUnstagedChanges()
-          await git.dropBackup()
-        }
+        task: () => git.dropBackup()
       }
     ],
     listrOptions

diff --git a/test/__snapshots__/runAll.spec.js.snap b/test/__snapshots__/runAll.spec.js.snap
@@ -23,6 +23,8 @@ LOG echo \\"sample\\" [started]
 LOG echo \\"sample\\" [completed]
 LOG Running tasks for *.js [completed]
 LOG Running tasks... [completed]
+LOG Applying unstaged changes... [started]
+LOG Applying unstaged changes... [completed]
 LOG Cleaning up... [started]
 LOG Cleaning up... [completed]"
 `;