diff options
Diffstat (limited to 'src/plugins/git/gitclient.h')
| -rw-r--r-- | src/plugins/git/gitclient.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index fb3a06b355..88c2f3870f 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -115,9 +115,8 @@ public: PushAction m_pushAction = NoPush; }; - explicit GitClient(GitSettings *settings); + GitClient(); static GitClient *instance(); - static GitSettings &settings(); Utils::FilePath vcsBinary() const override; QFuture<unsigned> gitVersion() const; @@ -350,6 +349,8 @@ public: QTextCodec *encoding(EncodingType encodingType, const Utils::FilePath &source = {}) const; private: + static GitSettings &settings(); + void finishSubmoduleUpdate(); void chunkActionsRequested(DiffEditor::DiffEditorController *controller, QMenu *menu, int fileIndex, int chunkIndex, |