diff options
author | hjk <[email protected]> | 2021-08-02 13:57:13 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2021-08-02 14:40:49 +0000 |
commit | b72582c050f331dfa725a5773c1cee91c4cd5bf3 (patch) | |
tree | 390bfdcc149603a5ea2a0a11fddf4210073a6bcb /src/plugins/git/gitclient.cpp | |
parent | ff57cb548d2c528a42fa2870b2486cddc08acfb7 (diff) |
Git: Use FilePath in findRepositoryForDirectory
Change-Id: Ia711377111d529e14ed864669df83e1b1bb2bfc9
Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r-- | src/plugins/git/gitclient.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 1afbffc273d..edfad745ca2 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -804,24 +804,24 @@ GitSettings &GitClient::settings() return static_cast<GitSettings &>(m_instance->VcsBaseClientImpl::settings()); } -QString GitClient::findRepositoryForDirectory(const QString &directory) const +FilePath GitClient::findRepositoryForDirectory(const FilePath &directory) const { - if (directory.isEmpty() || directory.endsWith("/.git") || directory.contains("/.git/")) - return QString(); + if (directory.isEmpty() || directory.endsWith("/.git") || directory.path().contains("/.git/")) + return {}; // QFileInfo is outside loop, because it is faster this way QFileInfo fileInfo; FilePath parent; - for (FilePath dir = FilePath::fromString(directory); !dir.isEmpty(); dir = dir.parentDir()) { + for (FilePath dir = directory; !dir.isEmpty(); dir = dir.parentDir()) { const FilePath gitName = dir.pathAppended(GIT_DIRECTORY); if (!gitName.exists()) continue; // parent might exist fileInfo.setFile(gitName.toString()); if (fileInfo.isFile()) - return dir.toString(); + return dir; if (gitName.pathAppended("config").exists()) - return dir.toString(); + return dir; } - return QString(); + return {}; } QString GitClient::findGitDirForRepository(const FilePath &repositoryDir) const |