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

Git: Fix adding existing files in nested directories

Browse Source 
Amends 48c56416f5.

Fixes: QTCREATORBUG-27644
Change-Id: I4ef58c017e4fcf8fa48905f7e0b649433b3cac0f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Orgad Shaneh
2022-10-11 16:11:35 +03:00
committed by Orgad Shaneh
parent 693db6eef6
commit d2160e8b4f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/git/gitclient.cpp
View File

@@ -916,11 +916,12 @@ FilePaths GitClient::unmanagedFiles(const FilePaths &filePaths) const
const CommandResult result = vcsSynchronousExec(it.key(), args, RunFlags::NoOutput);
if (result.result() != ProcessResult::FinishedWithSuccess)
return filePaths;
const QStringList managedFilePaths
= transform(result.cleanedStdOut().split('\0', Qt::SkipEmptyParts),
[&wd](const QString &fp) { return wd.absoluteFilePath(fp); });
const QStringList filtered = Utils::filtered(it.value(), [&managedFilePaths, &wd](const QString &fp) {
return !managedFilePaths.contains(wd.absoluteFilePath(fp));
const auto toAbs = [&wd](const QString &fp) { return wd.absoluteFilePath(fp); };
const QStringList managedFilePaths =
Utils::transform(result.cleanedStdOut().split('\0', Qt::SkipEmptyParts), toAbs);
const QStringList absPaths = Utils::transform(it.value(), toAbs);
const QStringList filtered = Utils::filtered(absPaths, [&managedFilePaths](const QString &fp) {
return !managedFilePaths.contains(fp);
});
res += FileUtils::toFilePathList(filtered);
}