From e9eeaf33b3a84b32b2ef31c964b8cbea738cac59 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 30 Sep 2018 08:46:48 +0300 Subject: [PATCH] Git: Detect also gitfile in isVcsFileOrDirectory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic182407505fbcb9b5bd1768126885c4b06a30280 Reviewed-by: André Hartmann --- src/plugins/git/gitversioncontrol.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index aa6069e2f74..dc0607cbb73 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -78,8 +78,11 @@ Core::Id GitVersionControl::id() const bool GitVersionControl::isVcsFileOrDirectory(const Utils::FileName &fileName) const { - return fileName.toFileInfo().isDir() - && !fileName.fileName().compare(".git", Utils::HostOsInfo::fileNameCaseSensitivity()); + if (fileName.fileName().compare(".git", Utils::HostOsInfo::fileNameCaseSensitivity())) + return false; + if (fileName.toFileInfo().isDir()) + return true; + return QFile(fileName.toString()).readLine().startsWith("gitdir: "); } bool GitVersionControl::isConfigured() const