feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Detect also gitfile in isVcsFileOrDirectory

Browse Source 
Change-Id: Ic182407505fbcb9b5bd1768126885c4b06a30280
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2018-09-30 08:46:48 +03:00
committed by Orgad Shaneh
parent f01ee04f4f
commit e9eeaf33b3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/git/gitversioncontrol.cpp
View File

@@ -78,8 +78,11 @@ Core::Id GitVersionControl::id() const
bool GitVersionControl::isVcsFileOrDirectory(const Utils::FileName &fileName) const bool GitVersionControl::isVcsFileOrDirectory(const Utils::FileName &fileName) const
{ {
return fileName.toFileInfo().isDir() if (fileName.fileName().compare(".git", Utils::HostOsInfo::fileNameCaseSensitivity()))
&& !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 bool GitVersionControl::isConfigured() const