From: Patrick Bader <patrick.bader@thingos.io>
Date: Mon, 4 Mar 2024 15:14:25 +0000 (+0100)
Subject: fix: project submodule detection does not work for worktrees
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0404f6281aef2e3d1f22fb9ded6e1ff1710e65f5;p=emacs.git

fix: project submodule detection does not work for worktrees

(cherry picked from commit 5037b9eed711dec0ef73dd6fca1e60e0b521c13b)
---

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index b92d326fbf5..47db14bde27 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -597,7 +597,7 @@ See `project-vc-extra-root-markers' for the marker value format.")
         (goto-char (point-min))
         ;; Kind of a hack to distinguish a submodule from
         ;; other cases of .git files pointing elsewhere.
-        (looking-at "gitdir: [./]+/\\.git/modules/"))
+        (looking-at "gitdir: .+/\\.git/\\(worktrees/.*\\)?modules/"))
       t)
      (t nil))))