aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.h
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2013-06-11 23:53:28 +0300
committerOrgad Shaneh <[email protected]>2013-06-12 10:15:00 +0200
commit709920e013055c6ebd7116c4c045d6601396e408 (patch)
tree1d0917dab3ffaf6047572f9ffa0d2fe2fa2097aa /src/plugins/git/gitclient.h
parentc9d1a72af1af7bf923bac9ab3f43e1076a2bb780 (diff)
Git: Fix expecting changes in executeGit
Calling setExpectChanges after execute is too late Change-Id: I852c224206fcd758943252029b8e9b050920ca5c Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r--src/plugins/git/gitclient.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 46b19e2ec09..3c8cc28a2f9 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -350,10 +350,11 @@ private:
int editorLineNumber = -1);
VcsBase::Command *executeGit(const QString &workingDirectory,
- const QStringList &arguments,
- VcsBase::VcsBaseEditorWidget* editor = 0,
- bool useOutputToWindow = false,
- int editorLineNumber = -1);
+ const QStringList &arguments,
+ VcsBase::VcsBaseEditorWidget* editor = 0,
+ bool useOutputToWindow = false,
+ bool expectChanges = false,
+ int editorLineNumber = -1);
// Fully synchronous git execution (QProcess-based).
bool fullySynchronousGit(const QString &workingDirectory,