Avoid potential regular locking up of Qt Creator whenever working on a

project that is not in git.

Backport of the non-intrusive parts of 5923733889075800a0979c73476bf3bbae204e89

2 files changed, 1 insertions, 16 deletions

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 6102efcc86..242e42db45 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -153,28 +153,14 @@ GitClient::~GitClient()
 
 const char *GitClient::noColorOption = "--no-color";
 
-QString GitClient::findRepositoryForFile(const QString &fileName)
-{
-    const QString gitDirectory = QLatin1String(kGitDirectoryC);
-    const QFileInfo info(fileName);
-    QDir dir = info.absoluteDir();
-    do {
-        if (dir.entryList(QDir::AllDirs|QDir::Hidden).contains(gitDirectory))
-            return dir.absolutePath();
-    } while (dir.cdUp());
-
-    return QString();
-}
-
 QString GitClient::findRepositoryForDirectory(const QString &dir)
 {
     const QString gitDirectory = QLatin1String(kGitDirectoryC);
     QDir directory(dir);
     do {
-        if (directory.entryList(QDir::AllDirs|QDir::Hidden).contains(gitDirectory))
+        if (QFileInfo(directory, gitDirectory).isDir())
             return directory.absolutePath();
     } while (directory.cdUp());
-
     return QString();
 }
 
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 81803fe8b2..99f95fd6e0 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -75,7 +75,6 @@ public:
     bool managesDirectory(const QString &) const { return false; }
     QString findTopLevelForDirectory(const QString &) const { return QString(); }
 
-    static QString findRepositoryForFile(const QString &fileName);
     static QString findRepositoryForDirectory(const QString &dir);
 
     void diff(const QString &workingDirectory, const QStringList &diffArgs, const QString &fileName);