aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.h
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2018-09-18 07:43:22 +0300
committerOrgad Shaneh <[email protected]>2018-09-19 17:02:24 +0000
commit296ae92853112f89accdd510bbee312e415e648f (patch)
treea96abfff4898ff12e404e9f5dd948fb2d27089c7 /src/plugins/git/gitclient.h
parent641c9f7db9cc169f4b9d54f926b22102e655a054 (diff)
Git: Change pull to run asynchronously
Fixes: QTCREATORBUG-13279 Change-Id: Idee6e64e5eebe729e7c1d0e0135a1d8b464187b7 Reviewed-by: AndrĂ© Hartmann <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r--src/plugins/git/gitclient.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 655b49c9e08..03ee95dd5f8 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -126,7 +126,7 @@ public:
VcsBase::VcsCommand *vcsExecAbortable(const QString &workingDirectory,
const QStringList &arguments,
- bool createProgressParser = false);
+ bool isRebase = false);
QString findRepositoryForDirectory(const QString &dir) const;
QString findGitDirForRepository(const QString &repositoryDir) const;
@@ -242,7 +242,7 @@ public:
bool isFastForwardMerge(const QString &workingDirectory, const QString &branch);
void fetch(const QString &workingDirectory, const QString &remote);
- bool synchronousPull(const QString &workingDirectory, bool rebase);
+ void pull(const QString &workingDirectory, bool rebase);
void push(const QString &workingDirectory, const QStringList &pushArgs = QStringList());
bool synchronousMerge(const QString &workingDirectory, const QString &branch,
bool allowFastForward = true);