diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-09-30 08:46:48 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2018-09-30 13:18:44 +0000 |
| commit | e9eeaf33b3a84b32b2ef31c964b8cbea738cac59 (patch) | |
| tree | bfecbb24472e33612237a3f15cf4e71eeebcf3be /src/plugins/git/gitversioncontrol.cpp | |
| parent | f01ee04f4fa1334ca6e2dcc6c31289676f98d1b1 (diff) | |
| download | qt-creator-e9eeaf33b3a84b32b2ef31c964b8cbea738cac59.tar.gz | |
Git: Detect also gitfile in isVcsFileOrDirectory
Change-Id: Ic182407505fbcb9b5bd1768126885c4b06a30280
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/git/gitversioncontrol.cpp')
| -rw-r--r-- | src/plugins/git/gitversioncontrol.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index aa6069e2f7..dc0607cbb7 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 |