From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 15 May 2020 21:06:39 +0000 (+0300)
Subject: Fix submodules, second try
X-Git-Tag: emacs-28.0.90~7352
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4307a84fd8cb57934f45ee4450c91c08bb86b4a3;p=emacs.git

Fix submodules, second try

* lisp/progmodes/project.el (project-try-vc):
Call the backend directly instead of binding default-directory.
---

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index faa60d123fb..0ce2786a4dd 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -274,8 +274,7 @@ backend implementation of `project-external-roots'.")
             ('Git
              ;; Don't stop at submodule boundary.
              (or (vc-file-getprop dir 'project-git-root)
-                 (let* ((default-directory dir)
-                        (root (vc-root-dir))
+                 (let* ((root (vc-call-backend backend 'root dir))
                         (gitfile (expand-file-name ".git" root)))
                    (vc-file-setprop
                     dir 'project-git-root
@@ -287,9 +286,8 @@ backend implementation of `project-external-roots'.")
                         (goto-char (point-min))
                         (looking-at "gitdir: [./]+/\.git/modules/"))
                       (let* ((parent (file-name-directory
-                                      (directory-file-name root)))
-                             (default-directory parent))
-                        (vc-root-dir)))
+                                      (directory-file-name root))))
+                        (vc-call-backend backend 'root parent)))
                      (t root)))
                    )))
             ('nil nil)