fix: fix the incorrect relativeTopLevelDir detection when working with the worktree (#1608)

srsatt · Pavel Reutov · iiroj · web-flow · commit 4e3ce225b33f · 2025-08-08T17:32:24.000+03:00
* fix: fix the incorrect relativeTopLevelDir detection for the cases when when the folder is worktree

* docs: create ten-bears-battle.md

---------

Co-authored-by: Pavel Reutov &lt;pavel.reutov@jetbrains.com&gt;
Co-authored-by: Iiro Jäppinen &lt;iiro@jappinen.fi&gt;
diff --git a/.changeset/ten-bears-battle.md b/.changeset/ten-bears-battle.md
@@ -0,0 +1,5 @@
+---
+"lint-staged": patch
+---
+
+Detect the git repo's top-level directory correctly when in a worktree.
diff --git a/lib/resolveGitRepo.js b/lib/resolveGitRepo.js
@@ -39,18 +39,18 @@ 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
 
+    /** 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')
+
     const topLevelDir = normalizePath(path.join(cwd, relativeTopLevelDir))
     debugLog('Resolved git repository top-level directory to be `%s`', topLevelDir)
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"lint-staged": patch
 +---
++
 +Detect the git repo's top-level directory correctly when in a worktree.