lint-staged 17.0.2 → 17.0.3

package/lib/execGit.js

@@ -21,6 +21,7 @@ export const execGit = async (cmd, options) => {
   debugLog('Running git command:', cmd)
   const result = exec('git', [...NO_SUBMODULE_RECURSE, ...cmd], {
     nodeOptions: {
+      env: options?.env,
       cwd: options?.cwd,
       stdio: ['ignore'],
     },

package/lib/gitWorkflow.js

@@ -294,16 +294,26 @@ export class GitWorkflow {
       }
     }
 
-    // Unset GIT_INDEX_FILE so that the default index is always updated after running tasks
-    // Otherwise committing a pathspec (which uses a temporary non-default index) will leave
-    // changes in the worktree and default index
-    debugLog('Unset GIT_INDEX_FILE (was `%s`)', process.env.GIT_INDEX_FILE)
-    delete process.env.GIT_INDEX_FILE
+    const gitIndexFile = process.env.GIT_INDEX_FILE
+      ? normalizePath(process.env.GIT_INDEX_FILE)
+      : undefined
+
+    const adjustedGitIndexFile = gitIndexFile
+      ? gitIndexFile.endsWith('.git/index.lock')
+        ? // Relative and absolute default path should stay as-is
+          gitIndexFile
+        : // Non-default path is redirected to default
+          '.git/index.lock'
+      : undefined
 
     debugLog('Updating Git index again after task modifications...')
 
     // Update index for the files that were originally staged, ignore others
-    await this.execGit(['update-index', '--again'])
+    await this.execGit(['update-index', '--again'], {
+      env: {
+        GIT_INDEX_FILE: adjustedGitIndexFile,
+      },
+    })
 
     debugLog('Done updating Git index again after task modifications!')
 

package/package.json

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