diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2022-10-11 16:11:35 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2022-10-11 15:31:54 +0000 |
| commit | d2160e8b4f267e176c6f64bea58c6bfcb794764f (patch) | |
| tree | fb0a9903246989951efd4c3f41e3f0e3c7c4c3a1 /src/plugins/git | |
| parent | 693db6eef60327651b9ae9daf6f48835bfb73d66 (diff) | |
Git: Fix adding existing files in nested directories
Amends 48c56416f5e128c04f2d2d867b518775e0527607.
Fixes: QTCREATORBUG-27644
Change-Id: I4ef58c017e4fcf8fa48905f7e0b649433b3cac0f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index fdc1c9a625..3dd289654f 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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); } |