diff options
| author | Eike Ziller <[email protected]> | 2021-09-30 09:00:11 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2021-09-30 09:00:11 +0200 |
| commit | 6ba849ee6e59b1f8876ccbe2558face0738a7080 (patch) | |
| tree | 7140abdb5c2e7dc474791d4506ae982a5eb3b9d7 /src/plugins/git/gitclient.cpp | |
| parent | 525039daebe783560d2ba7f12db573f25d745852 (diff) | |
| parent | 67c0104b8e56a3d3089a309e1e09c6380639249b (diff) | |
Merge remote-tracking branch 'origin/5.0' into 6.0
Change-Id: I1244ca0b6193d00ded38e5d4c12b605f4e96fdae
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 10d02bdf500..f12eb5915b1 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -983,7 +983,7 @@ void GitClient::requestReload(const QString &documentId, const QString &source, QTC_ASSERT(document, return); GitBaseDiffEditorController *controller = factory(document); QTC_ASSERT(controller, return); - controller->setVcsBinary(settings().binaryPath.filePath()); + controller->setVcsBinary(settings().gitExecutable()); controller->setVcsTimeoutS(settings().timeout.value()); controller->setProcessEnvironment(processEnvironment()); controller->setWorkingDirectory(workingDirectory); |