Git: Do not read working directory before it is set

This amends commit c17767c78e.

Change-Id: Ide6f9de2420dd1262b27aed83351b76404cdba30
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>

src/plugins/git/gitclient.cpp

@@ -276,12 +276,14 @@ protected:
                                          const QString &leftCommit,
                                          const QString &rightCommit);
 
-protected:
     void runCommand(const QList<QStringList> &args, QTextCodec *codec = nullptr);
 
     QStringList addConfigurationArguments(const QStringList &args) const;
     QStringList baseArguments() const;
 
+public:
+    void initialize();
+
 private:
     void updateBranchList();
 
@@ -318,7 +320,11 @@ GitBaseDiffEditorController::GitBaseDiffEditorController(IDocument *document,
     connect(&m_decorator, &DescriptionWidgetDecorator::branchListRequested,
             this, &GitBaseDiffEditorController::updateBranchList);
     setDisplayName("Git Diff");
-    if (rightCommit.isEmpty()) {
+}
+
+void GitBaseDiffEditorController::initialize()
+{
+    if (m_rightCommit.isEmpty()) {
         // This is workaround for lack of support for merge commits and resolving conflicts,
         // we compare the current state of working tree to the HEAD of current branch
         // instead of showing unsupported combined diff format.
@@ -941,19 +947,20 @@ void GitClient::stage(DiffEditor::DiffEditorController *diffController,
 
 void GitClient::requestReload(const QString &documentId, const QString &source,
                               const QString &title, const QString &workingDirectory,
-                              std::function<VcsBaseDiffEditorController *(IDocument *)> factory) const
+                              std::function<GitBaseDiffEditorController *(IDocument *)> factory) const
 {
     // Creating document might change the referenced source. Store a copy and use it.
     const QString sourceCopy = source;
 
     IDocument *document = DiffEditorController::findOrCreateDocument(documentId, title);
     QTC_ASSERT(document, return);
-    VcsBaseDiffEditorController *controller = factory(document);
+    GitBaseDiffEditorController *controller = factory(document);
     QTC_ASSERT(controller, return);
     controller->setVcsBinary(settings().binaryPath());
     controller->setVcsTimeoutS(settings().vcsTimeoutS());
     controller->setProcessEnvironment(processEnvironment());
     controller->setWorkingDirectory(workingDirectory);
+    controller->initialize();
 
     connect(controller, &DiffEditorController::chunkActionsRequested,
             this, &GitClient::chunkActionsRequested, Qt::DirectConnection);

src/plugins/git/gitclient.h

@@ -48,10 +48,9 @@ QT_END_NAMESPACE
 namespace Core { class ICore; }
 
 namespace VcsBase {
-    class VcsCommand;
-    class SubmitFileModel;
-    class VcsBaseDiffEditorController;
-    class VcsBaseEditorWidget;
+class VcsCommand;
+class SubmitFileModel;
+class VcsBaseEditorWidget;
 }
 
 namespace DiffEditor {
@@ -63,6 +62,7 @@ namespace Git {
 namespace Internal {
 
 class CommitData;
+class GitBaseDiffEditorController;
 class GitSubmitEditorPanelData;
 class Stash;
 
@@ -377,7 +377,7 @@ private:
     QTextCodec *codecFor(CodecType codecType, const QString &source = QString()) const;
 
     void requestReload(const QString &documentId, const QString &source, const QString &title, const QString &workingDirectory,
-           std::function<VcsBase::VcsBaseDiffEditorController *(Core::IDocument *)> factory) const;
+           std::function<GitBaseDiffEditorController *(Core::IDocument *)> factory) const;
 
     // determine version as '(major << 16) + (minor << 8) + patch' or 0.
     unsigned synchronousGitVersion(QString *errorMessage = nullptr) const;