GitClient: Some minor corrections

Use GroupItem instead of ProcessTask inside topRevision().
Replace some [=] captures with more explicit ones.

Change-Id: I2e321f7121f80fd2689ecf57cd9735ba56a7962e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2023-10-31 20:32:57 +01:00
parent 3d0832cd4a
commit 7bec91c53e
4 changed files with 20 additions and 19 deletions

View File

@@ -19,6 +19,7 @@
#include <utils/elidinglabel.h>
#include <utils/fancylineedit.h>
#include <utils/navigationtreeview.h>
#include <utils/process.h>
#include <utils/qtcassert.h>
#include <utils/stylehelper.h>
#include <utils/utilsicons.h>
@@ -546,14 +547,14 @@ TaskTree *BranchView::onFastForwardMerge(const std::function<void()> &callback)
const TreeStorage<FastForwardStorage> storage;
const auto setupMergeBase = [=](Process &process) {
gitClient().setupCommand(process, m_repository, {"merge-base", "HEAD", branch});
const auto setupMergeBase = [repository = m_repository, branch](Process &process) {
gitClient().setupCommand(process, repository, {"merge-base", "HEAD", branch});
};
const auto onMergeBaseDone = [storage](const Process &process) {
storage->mergeBase = process.cleanedStdOut().trimmed();
};
const ProcessTask topRevisionProc = gitClient().topRevision(
const GroupItem topRevisionProc = gitClient().topRevision(
m_repository,
[storage](const QString &revision, const QDateTime &) {
storage->topRevision = revision;