lint-staged 17.0.6 → 17.0.8

package/README.md

@@ -772,6 +772,23 @@ module.exports = {
 
 ## Frequently Asked Questions
 
+### How does `lint-staged`'s stashing work?
+
+<details>
+<summary>Click to expand</summary>
+
+When running `lint-staged` with the default configuration, the following happens:
+
+1. The entire original state is backed up in a git stash using `git stash create` and `git stash store`. This leaves all files in the worktree by default — the regular `git stash` command would also remove them. This most probably ignores any untracked files, which is the default behavior of `git stash`.
+1. If some file is "_partially staged_", meaning there's both staged and unstaged changes in the same file, lint-staged will additionally save all of these in a patch file, basically like `git diff --patch >> .git/lint-staged_unstaged.patch`. After this, the unstaged changes to these files are removed from the worktree so that tasks only see the staged changes
+1. After running tasks, any new modifications to the originally staged files are added to the index
+1. After this, any originally unstaged changes to "_partially staged_" files are restored by applying the patch file from step 2.
+1. In case of any errors, the state is reset with `git reset` and the original state restored from the git stash created in step 1.
+
+If the process is interrupted at any point, it should be possible to restore changes from the git stash created in step 1. because it's only dropped in the last step, after successfully completing all previous steps in the process.
+
+</details>
+
 ### The output of commit hook looks weird (no colors, duplicate lines, verbose output on Windows, …)
 
 <details>

package/lib/execGit.js

@@ -4,9 +4,6 @@ import { createDebug } from './debug.js'
 
 const debugLog = createDebug('lint-staged:execGit')
 
-/** @example "warning: in the working copy of 'README.md', LF will be replaced by CRLF the next time Git touches it" */
-const GIT_CRLF_WARNING = /^warning.*CRLF.*the next time Git touches it/i
-
 /**
  * Explicitly never recurse commands into submodules, overriding local/global configuration.
  * @see https://git-scm.com/docs/git-config#Documentation/git-config.txt-submodulerecurse
@@ -19,27 +16,16 @@ export const GIT_GLOBAL_OPTIONS = [...NO_SUBMODULE_RECURSE]
 /** @type {(cmd: string[], options?: { cwd?: string }) => Promise<string>} */
 export const execGit = async (cmd, options) => {
   debugLog('Running git command:', cmd)
-  const result = exec('git', [...NO_SUBMODULE_RECURSE, ...cmd], {
+  const result = await exec('git', [...NO_SUBMODULE_RECURSE, ...cmd], {
     nodeOptions: {
       env: options?.env,
       cwd: options?.cwd,
     },
   })
 
-  let output = ''
-  for await (const line of result) {
-    if (GIT_CRLF_WARNING.test(line)) {
-      debugLog('Stripped Git CRLF warning: %s', line)
-      continue
-    }
-
-    output += line + '\n'
-  }
-  output = output.trimEnd()
-
   if (result.exitCode > 0) {
-    throw new Error(output, { cause: result })
+    throw new Error(result.stderr.trimEnd(), { cause: result })
   }
 
-  return output
+  return result.stdout.trimEnd()
 }

package/lib/gitWorkflow.js

@@ -249,6 +249,8 @@ export class GitWorkflow {
 
           /** The stash line starts with the short hash, so we split from space and choose the first part */
           ctx.backupHash = stashes.find((line) => line.includes(STASH))?.split(' ')[0]
+
+          await this.restoreMergeStatus(ctx)
         } else {
           /** Save stash of all changes, keeping all files as-is */
           const stashHash = await this.execGit(['stash', 'create'])
@@ -440,7 +442,6 @@ export class GitWorkflow {
       await this.execGit(['reset', '--hard', 'HEAD'])
       await this.execGit(['stash', 'apply', '--quiet', '--index', await this.getBackupStash(ctx)])
 
-      // Restore meta information about ongoing git merge
       await this.restoreMergeStatus(ctx)
 
       // Clean out patch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "17.0.6",
+  "version": "17.0.8",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": {
@@ -55,7 +55,7 @@
     "listr2": "^10.2.1",
     "picomatch": "^4.0.4",
     "string-argv": "^0.3.2",
-    "tinyexec": "1.2.2"
+    "tinyexec": "^1.2.4"
   },
   "optionalDependencies": {
     "yaml": "^2.9.0"
@@ -66,20 +66,20 @@
     "@commitlint/cli": "21.0.2",
     "@commitlint/config-conventional": "21.0.2",
     "@eslint/js": "10.0.1",
-    "@vitest/coverage-istanbul": "4.1.7",
-    "@vitest/eslint-plugin": "1.6.18",
+    "@vitest/coverage-istanbul": "4.1.9",
+    "@vitest/eslint-plugin": "1.6.20",
     "consolemock": "1.1.0",
     "cross-env": "10.1.0",
-    "eslint": "10.4.1",
+    "eslint": "10.5.0",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-n": "18.0.1",
+    "eslint-plugin-n": "18.1.0",
     "eslint-plugin-prettier": "5.5.6",
     "eslint-plugin-simple-import-sort": "13.0.0",
     "husky": "9.1.7",
     "mock-stdin": "1.0.0",
-    "prettier": "3.8.3",
-    "semver": "7.8.1",
-    "vitest": "4.1.7"
+    "prettier": "3.8.4",
+    "semver": "7.8.4",
+    "vitest": "4.1.9"
   },
   "keywords": [
     "lint",