aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/branchview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/git/branchview.cpp')
-rw-r--r--src/plugins/git/branchview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp
index 34f9b546cd3..ce3bca34858 100644
--- a/src/plugins/git/branchview.cpp
+++ b/src/plugins/git/branchview.cpp
@@ -542,10 +542,10 @@ TaskTree *BranchView::onFastForwardMerge(const std::function<void()> &callback)
const TreeStorage<FastForwardStorage> storage;
GitClient *client = GitClient::instance();
- const auto setupMergeBase = [=](QtcProcess &process) {
+ const auto setupMergeBase = [=](Process &process) {
client->setupCommand(process, m_repository, {"merge-base", "HEAD", branch});
};
- const auto onMergeBaseDone = [storage](const QtcProcess &process) {
+ const auto onMergeBaseDone = [storage](const Process &process) {
storage->mergeBase = process.cleanedStdOut().trimmed();
};