lint-staged 17.0.3 → 17.0.4

package/README.md

@@ -92,7 +92,7 @@ See [examples](#examples) and [configuration](#configuration) for more informati
 
 ## Changelog
 
-See [Releases](https://github.com/okonet/lint-staged/releases).
+See [Releases](https://github.com/lint-staged/lint-staged/releases).
 
 ### Migration
 
@@ -396,7 +396,7 @@ This will result in _lint-staged_ running `eslint file-1.js file-2.js`, when you
 
 ## Using JS configuration files
 
-Writing the configuration file in JavaScript is the most powerful way to configure lint-staged (`lint-staged.config.js`, [similar](https://github.com/okonet/lint-staged#configuration), or passed via `--config`). From the configuration file, you can export either a single function or an object.
+Writing the configuration file in JavaScript is the most powerful way to configure lint-staged (`lint-staged.config.js`, [similar](https://github.com/lint-staged/lint-staged#configuration), or passed via `--config`). From the configuration file, you can export either a single function or an object.
 
 If the `exports` value is a function, it will receive an array of all staged filenames. You can then build your own matchers for the files and return a command string or an array of command strings. These strings are considered complete and should include the filename arguments, if wanted.
 
@@ -497,7 +497,7 @@ export default {
 <details>
   <summary>Click to expand</summary>
 
-It's better to use the [function-based configuration (seen above)](https://github.com/okonet/lint-staged#example-export-a-function-to-build-your-own-matchers), if your use case is this.
+It's better to use the [function-based configuration (seen above)](https://github.com/lint-staged/lint-staged#example-export-a-function-to-build-your-own-matchers), if your use case is this.
 
 ```js
 // lint-staged.config.js
@@ -945,7 +945,7 @@ tl;dr: Yes, but the pattern should start with `../`.
 
 By default, `lint-staged` executes tasks only on the files present inside the project folder(where `lint-staged` is installed and run from).
 So this question is relevant _only_ when the project folder is a child folder inside the git repo.
-In certain project setups, it might be desirable to bypass this restriction. See [#425](https://github.com/okonet/lint-staged/issues/425), [#487](https://github.com/okonet/lint-staged/issues/487) for more context.
+In certain project setups, it might be desirable to bypass this restriction. See [#425](https://github.com/lint-staged/lint-staged/issues/425), [#487](https://github.com/lint-staged/lint-staged/issues/487) for more context.
 
 `lint-staged` provides an escape hatch for the same(`>= v7.3.0`). For patterns that start with `../`, all the staged files are allowed to match against the pattern.
 Note that patterns like `*.js`, `**/*.js` will still only match the project files and not any of the files in parent or sibling directories.
@@ -993,7 +993,7 @@ npx lint-staged --diff="$(git merge-base main HEAD)"
 
 You should not use `ng lint` through _lint-staged_, because it's designed to lint an entire project. Instead, you can add `ng lint` to your git pre-commit hook the same way as you would run lint-staged.
 
-See issue [!951](https://github.com/okonet/lint-staged/issues/951) for more details and possible workarounds.
+See issue [!951](https://github.com/lint-staged/lint-staged/issues/951) for more details and possible workarounds.
 
 </details>
 
@@ -1033,7 +1033,7 @@ export default {
 
 In versions of ESLint > 7, [isPathIgnored](https://eslint.org/docs/developer-guide/nodejs-api#-eslintispathignoredfilepath) is an async function and now returns a promise. The code below can be used to reinstate the above functionality.
 
-Since [10.5.3](https://github.com/okonet/lint-staged/releases), any errors due to a bad ESLint config will come through to the console.
+Since [10.5.3](https://github.com/lint-staged/lint-staged/releases), any errors due to a bad ESLint config will come through to the console.
 
 ```js
 import { ESLint } from 'eslint'
@@ -1088,7 +1088,7 @@ When running `lint-staged` via Husky hooks, TypeScript may ignore `tsconfig.json
 > **TS17004:** Cannot use JSX unless the '--jsx' flag is provided.
 > **TS1056:** Accessors are only available when targeting ECMAScript 5 and higher.
 
-See issue [#825](https://github.com/okonet/lint-staged/issues/825) for more details.
+See issue [#825](https://github.com/lint-staged/lint-staged/issues/825) for more details.
 
 #### Root Cause
 

package/lib/gitWorkflow.js

@@ -294,28 +294,37 @@ export class GitWorkflow {
       }
     }
 
-    const gitIndexFile = process.env.GIT_INDEX_FILE
+    // This looks confusing but the intent is to only normalize truthy values
+    const activeIndexFile = 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'], {
-      env: {
-        GIT_INDEX_FILE: adjustedGitIndexFile,
-      },
-    })
-
-    debugLog('Done updating Git index again after task modifications!')
+      : process.env.GIT_INDEX_FILE
+
+    debugLog('Updating active Git index again: %s', activeIndexFile)
+    await this.execGit(['update-index', '--again'])
+    debugLog('Done updating Git index again: %s', activeIndexFile)
+
+    if (activeIndexFile?.endsWith('.lock')) {
+      const defaultIndexLock = normalizePath(
+        await this.execGit(['rev-parse', '--path-format=absolute', '--git-path', 'index.lock'])
+      )
+
+      /**
+       * If the active index file is a non-default lockfile, we are committing with a pathspec
+       * without having explicitly run `git add`. In this case we need to also update the
+       * default index, otherwise there will be leftover diff after committing
+       */
+      if (activeIndexFile !== defaultIndexLock) {
+        debugLog('Updating default Git index lock again: %s', defaultIndexLock)
+
+        await this.execGit(['update-index', '--again'], {
+          env: {
+            GIT_INDEX_FILE: defaultIndexLock,
+          },
+        })
+
+        debugLog('Done updating default Git index lock again: %s', defaultIndexLock)
+      }
+    }
 
     const stagedFilesAfterAdd = await this.execGit([
       ...getDiffCommand(this.diff, this.diffFilter),

package/lib/messages.js

@@ -59,7 +59,7 @@ export const invalidOption = (name, value, message) => `${red(`${error} Validati
 
   ${message}
 
-See https://github.com/okonet/lint-staged#command-line-flags`
+See https://github.com/lint-staged/lint-staged#command-line-flags`
 
 export const PREVENTED_EMPTY_COMMIT = `
   ${yellow(`${warning} lint-staged prevented an empty git commit.
@@ -87,7 +87,7 @@ export const failedToParseConfig = (
 
 ${error}
 
-See https://github.com/okonet/lint-staged#configuration.`
+See https://github.com/lint-staged/lint-staged#configuration.`
 
 export const UNSTAGED_CHANGES_BACKUP_STASH_LOCATION = `Unstaged changes have been kept back in a patch file:`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-staged",
-  "version": "17.0.3",
+  "version": "17.0.4",
   "description": "Lint files staged by git",
   "license": "MIT",
   "repository": {
@@ -59,11 +59,11 @@
   "devDependencies": {
     "@changesets/changelog-github": "0.7.0",
     "@changesets/cli": "2.31.0",
-    "@commitlint/cli": "20.5.3",
-    "@commitlint/config-conventional": "20.5.3",
+    "@commitlint/cli": "21.0.0",
+    "@commitlint/config-conventional": "21.0.0",
     "@eslint/js": "10.0.1",
     "@vitest/coverage-istanbul": "4.1.5",
-    "@vitest/eslint-plugin": "1.6.16",
+    "@vitest/eslint-plugin": "1.6.17",
     "consolemock": "1.1.0",
     "cross-env": "10.1.0",
     "eslint": "10.3.0",
@@ -74,7 +74,7 @@
     "husky": "9.1.7",
     "mock-stdin": "1.0.0",
     "prettier": "3.8.3",
-    "semver": "7.7.4",
+    "semver": "7.8.0",
     "vitest": "4.1.5"
   },
   "keywords": [