make TortoiseGit using TortoisePlink for SSH protocol by default.

[tortoisegit/TortoiseGitJp.git] / src / Git / Git.cpp

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 2733a88..5deef2f 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -735,15 +735,20 @@ BOOL CGit::CheckMsysGitDir()
        }\r
 \r
        //setup ssh client\r
-       CRegString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));\r
-       CString ssh=sshclient;\r
+       CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));\r
 \r
-       if(!ssh.IsEmpty())\r
+       if(!sshclient.IsEmpty())\r
        {\r
-               _tputenv_s(_T("GIT_SSH"),ssh);\r
+               _tputenv_s(_T("GIT_SSH"),sshclient);\r
        }else\r
        {\r
-               _tputenv_s(_T("GIT_SSH"),_T(""));\r
+               TCHAR sPlink[MAX_PATH];\r
+               GetModuleFileName(NULL, sPlink, _countof(sPlink));\r
+               LPTSTR ptr = _tcsrchr(sPlink, _T('\\'));\r
+               if (ptr) {\r
+                       _tcscpy(ptr + 1, _T("TortoisePlink.exe"));\r
+                       _tputenv_s(_T("GIT_SSH"), sPlink);\r
+               }\r
        }\r
 \r
        // search PATH if git/bin directory is alredy present\r