[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kate] addons/project: project: fix git submodules scanning
From:       Michal Humpula <michal.humpula () hudrydum ! cz>
Date:       2016-04-24 5:39:16
Message-ID: E1auClI-0004m1-IR () scm ! kde ! org
[Download RAW message or body]

Git commit 73cb7eab8c4087f5756159c00065e58104ec4b30 by Michal Humpula.
Committed on 23/04/2016 at 20:29.
Pushed by michalhumpula into branch 'master'.

project: fix git submodules scanning

New versions of Qt silenty started to return "." instead of "" as
result of `QDir("/tmp").relativeFilePath("/tmp")`.

Adding aditional check for "." to fix it.

REVIEW: 127731

M  +1    -1    addons/project/kateprojectworker.cpp

http://commits.kde.org/kate/73cb7eab8c4087f5756159c00065e58104ec4b30

diff --git a/addons/project/kateprojectworker.cpp b/addons/project/kateprojectworker.cpp
index 47c79bb..6c23946 100644
--- a/addons/project/kateprojectworker.cpp
+++ b/addons/project/kateprojectworker.cpp
@@ -399,7 +399,7 @@ QStringList KateProjectWorker::filesFromGit(const QDir &dir, bool recursive)
 
     files.append(gitSearchTree(tree, path, recursive));
 
-    if (recursive && relpathUtf8.isEmpty()) {
+    if (recursive && (relpathUtf8.isEmpty() || relpathUtf8 == ".")) {
         files.append(gitSearchSubmodules(repo, path));
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]