lint-staged 16.1.1 → 16.1.2

package/lib/chunkFiles.js

@@ -52,7 +52,11 @@ export const chunkFiles = ({ files, baseDir, maxArgLength = null, relative = fal
     return [normalizedFiles] // wrap in an array to return a single chunk
   }
 
-  const fileListLength = normalizedFiles.map((file) => file.filepath).join(' ').length
+  /** Calculate total character length of all filepaths, with added spaces in between */
+  const fileListLength =
+    normalizedFiles.reduce((sum, file) => sum + file.filepath.length, 0) +
+    Math.max(normalizedFiles.length - 1, 0)
+
   debugLog(
     `Resolved an argument string length of ${fileListLength} characters from ${normalizedFiles.length} files`
   )

package/lib/gitWorkflow.js

@@ -1,3 +1,4 @@
+import fs from 'node:fs/promises'
 import path from 'node:path'
 
 import debug from 'debug'
@@ -279,8 +280,22 @@ export class GitWorkflow {
     // These additions per chunk are run "serially" to prevent race conditions.
     // Git add creates a lockfile in the repo causing concurrent operations to fail.
     for (const files of this.matchedFileChunks) {
-      /** @todo Deleted files cannot be staged because they're... deleted */
-      await this.execGit(['add', '--', ...files.map((f) => f.filepath)])
+      const accessCheckedFiles = await Promise.allSettled(
+        files.map(async (f) => {
+          if (f.status === 'D') {
+            await fs.access(f.filepath)
+            return f.filepath // File is no longer deleted and can be added
+          } else {
+            return f.filepath
+          }
+        })
+      )
+
+      const addableFiles = accessCheckedFiles.flatMap((r) =>
+        r.status === 'fulfilled' ? [r.value] : []
+      )
+
+      await this.execGit(['add', '--', ...addableFiles])
     }
 
     debugLog('Done adding task modifications to index!')

package/lib/resolveGitRepo.js

@@ -8,53 +8,53 @@ import { normalizePath } from './normalizePath.js'
 const debugLog = debug('lint-staged:resolveGitRepo')
 
 /**
- * Resolve .git directory relative to repo top-level directory
- *
- * @example ".git"
+ * Relative path up to the repo top-level directory
+ * @example "../"
  */
-const resolveRelativeGitDir = async (cwd) => {
-  /**
-   * Absolute repo top-level directory
-   *
-   * @example <caption>Git on macOS</caption>
-   * "/Users/iiro/Documents/git/lint-staged"
-   *
-   * @example <caption>Git for Windows</caption>
-   * "C:\Users\iiro\Documents\git\lint-staged"
-   *
-   * @example <caption>Git installed with MSYS2, this doesn't work when used as CWD with Node.js child_process</caption>
-   * "/c/Users/iiro/Documents/git/lint-staged"
-   */
-  const topLevelPromise = execGit(['rev-parse', '--show-toplevel'], { cwd })
-
-  /**
-   * Absolute .git directory, similar to top-level
-   *
-   * @example "/Users/iiro/Documents/git/lint-staged/.git"
-   */
-  const absoluteGitDirPromise = execGit(['rev-parse', '--absolute-git-dir'], { cwd })
+const CDUP = '--show-cdup'
 
-  const [topLevel, absoluteGitDir] = await Promise.all([topLevelPromise, absoluteGitDirPromise])
+/**
+ * Absolute repo top-level directory
+ *
+ * @example <caption>Git on macOS</caption>
+ * "/Users/iiro/Documents/git/lint-staged"
+ *
+ * @example <caption>Git for Windows</caption>
+ * "C:\Users\iiro\Documents\git\lint-staged"
+ *
+ * @example <caption>Git installed with MSYS2, this doesn't work when used as CWD with Node.js child_process</caption>
+ * "/c/Users/iiro/Documents/git/lint-staged"
+ */
+const TOPLEVEL = '--show-toplevel'
 
-  return path.relative(topLevel, absoluteGitDir)
-}
+/**
+ * Absolute .git directory, similar to top-level
+ *
+ * @example "/Users/iiro/Documents/git/lint-staged/.git"
+ */
+const ABSOLUTE_GIT_DIR = '--absolute-git-dir'
 
 /** Resolve git directory and possible submodule paths */
 export const resolveGitRepo = async (cwd = process.cwd()) => {
   try {
     debugLog('Resolving git repo from `%s`', cwd)
 
+    /** Git rev-parse returns all three flag values on separate lines  */
+    const revParseOutput = await execGit(['rev-parse', CDUP, TOPLEVEL, ABSOLUTE_GIT_DIR], {
+      cwd,
+    })
+    const [relativeTopLevelDir, topLevel, absoluteGitDir] = revParseOutput.split('\n')
+
     // Unset GIT_DIR before running any git operations in case it's pointing to an incorrect location
     debugLog('Unset GIT_DIR (was `%s`)', process.env.GIT_DIR)
     delete process.env.GIT_DIR
     debugLog('Unset GIT_WORK_TREE (was `%s`)', process.env.GIT_WORK_TREE)
     delete process.env.GIT_WORK_TREE
 
-    const relativeTopLevelDir = await execGit(['rev-parse', '--show-cdup'], { cwd })
     const topLevelDir = normalizePath(path.join(cwd, relativeTopLevelDir))
     debugLog('Resolved git repository top-level directory to be `%s`', topLevelDir)
 
-    const relativeGitConfigDir = await resolveRelativeGitDir(cwd)
+    const relativeGitConfigDir = path.relative(topLevel, absoluteGitDir)
     const gitConfigDir = normalizePath(path.join(topLevelDir, relativeGitConfigDir))
     debugLog('Resolved git config directory to be `%s`', gitConfigDir)
 

package/lib/runAll.js

@@ -302,8 +302,6 @@ export const runAll = async (
     diffFilter,
   })
 
-  logger.log('shouldHidePartiallyStagedFiles', shouldHidePartiallyStagedFiles(ctx))
-
   const runner = new Listr(
     [
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "16.1.1",
+  "version": "16.1.2",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": {