Merge pull request #1679 from rstudio/bugfix/vcs-executable-paths

resolve aliased vcs paths from client
rstudio · Oct 26, 2017 · 5f19c80 · 5f19c80
2 parents 6f9f8f0 + 5f77b25
commit 5f19c80
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/cpp/session/modules/SessionWorkbench.cpp b/src/cpp/session/modules/SessionWorkbench.cpp
@@ -431,19 +431,19 @@ Error setPrefs(const json::JsonRpcRequest& request, json::JsonRpcResponse*)
    userSettings().beginUpdate();
    userSettings().setVcsEnabled(vcsEnabled);
 
-   FilePath gitExePath(gitExe);
+   FilePath gitExePath = module_context::resolveAliasedPath(gitExe);
    if (gitExePath == git::detectedGitExePath())
       userSettings().setGitExePath(FilePath());
    else
       userSettings().setGitExePath(gitExePath);
 
-   FilePath svnExePath(svnExe);
+   FilePath svnExePath = module_context::resolveAliasedPath(svnExe);
    if (svnExePath == svn::detectedSvnExePath())
       userSettings().setSvnExePath(FilePath());
    else
       userSettings().setSvnExePath(svnExePath);
 
-   FilePath terminalFilePath(terminalPath);
+   FilePath terminalFilePath = module_context::resolveAliasedPath(terminalPath);
    if (terminalFilePath == detectedTerminalPath())
       userSettings().setVcsTerminalPath(FilePath());
    else