From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 15 May 2020 19:09:55 +0000 (+0300)
Subject: Fix Git submodules detection breakage
X-Git-Tag: emacs-28.0.90~7354
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=afca37343d0637386e4dfc4fb04d8700f3c6bf0d;p=emacs.git

Fix Git submodules detection breakage

* lisp/progmodes/project.el (project-try-vc):
Use the absolute name of .git both times.
---

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index eeff809e2a3..faa60d123fb 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -1,7 +1,7 @@
 ;;; project.el --- Operations on the current project  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2015-2020 Free Software Foundation, Inc.
-;; Version: 0.1.1
+;; Version: 0.1.2
 ;; Package-Requires: ((emacs "26.3"))
 
 ;; This is a GNU ELPA :core package.  Avoid using functionality that
@@ -275,14 +275,15 @@ backend implementation of `project-external-roots'.")
              ;; Don't stop at submodule boundary.
              (or (vc-file-getprop dir 'project-git-root)
                  (let* ((default-directory dir)
-                        (root (vc-root-dir)))
+                        (root (vc-root-dir))
+                        (gitfile (expand-file-name ".git" root)))
                    (vc-file-setprop
                     dir 'project-git-root
                     (cond
-                     ((file-directory-p (expand-file-name ".git" root))
+                     ((file-directory-p gitfile)
                       root)
                      ((with-temp-buffer
-                        (insert-file-contents ".git")
+                        (insert-file-contents gitfile)
                         (goto-char (point-min))
                         (looking-at "gitdir: [./]+/\.git/modules/"))
                       (let* ((parent (file-name-directory