Workaround Issue 73: Error while reading/writing the registry key MSysGit Access...

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

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index f2168eb..49a5059 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -171,7 +171,9 @@ int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CStri
 \r
        LPTSTR pEnv = l_processEnv;\r
        DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;\r
-       dwFlags |= DETACHED_PROCESS;\r
+       \r
+       //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password. \r
+       dwFlags |= DETACHED_PROCESS; \r
 \r
        if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
        {\r
@@ -303,13 +305,15 @@ CString CGit::GetUserName(void)
 {\r
        CString UserName;\r
        Run(_T("git.exe config user.name"),&UserName,CP_UTF8);\r
-       return UserName;\r
+       int start = 0;\r
+       return UserName.Tokenize(_T("\n"),start);\r
 }\r
 CString CGit::GetUserEmail(void)\r
 {\r
        CString UserName;\r
        Run(_T("git.exe config user.email"),&UserName,CP_UTF8);\r
-       return UserName;\r
+       int start = 0;\r
+       return UserName.Tokenize(_T("\n"),start);\r
 }\r
 \r
 CString CGit::GetCurrentBranch(void)\r
@@ -399,15 +403,16 @@ int CGit::BuildOutputFormat(CString &format,bool IsFull)
                format += log;\r
                log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);\r
                format += log;\r
-               log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
-               format += log;\r
                log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);\r
                format += log;\r
        }\r
+       \r
        log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);\r
        format += log;\r
        log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);\r
        format += log;\r
+       log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
+       format += log;\r
 \r
        if(IsFull)\r
        {\r
@@ -776,8 +781,17 @@ BOOL CGit::CheckMsysGitDir()
                }\r
        }\r
 \r
-       _tputenv_s(_T("DISPLAY"),_T(":9999"));\r
-       _tputenv_s(_T("SSH_ASKPASS"),_T("/C/Program Files/TortoiseGit/bin/TortoiseProc.exe"));\r
+       {\r
+               TCHAR sAskPass[MAX_PATH];\r
+               GetModuleFileName(NULL, sAskPass, _countof(sAskPass));\r
+               LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));\r
+               if (ptr) \r
+               {\r
+                       _tcscpy(ptr + 1, _T("SshAskPass.exe"));\r
+                       _tputenv_s(_T("DISPLAY"),_T(":9999"));\r
+                       _tputenv_s(_T("SSH_ASKPASS"),sAskPass);\r
+               }\r
+       }\r
        // search PATH if git/bin directory is alredy present\r
        if ( FindGitPath() )\r
        {\r
@@ -787,7 +801,7 @@ BOOL CGit::CheckMsysGitDir()
 \r
        // add git/bin path to PATH\r
 \r
-       CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
+       CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);\r
        CString str=msysdir;\r
        if(str.IsEmpty())\r
        {\r
@@ -877,7 +891,7 @@ public:
        {\r
        }\r
 \r
-       UINT HexChar(char ch)\r
+       BYTE HexChar(char ch)\r
        {\r
                if (ch >= '0' && ch <= '9')\r
                        return (UINT)(ch - '0');\r
@@ -934,7 +948,9 @@ public:
                {\r
                        for (int i=0; i<20; i++)\r
                        {\r
-                               sha1[i] = (BYTE)((HexChar(line[0]) << 8) | HexChar(line[1]));\r
+                               sha1[i]  = (HexChar(line[0])<<4)&0xF0;\r
+                               sha1[i] |= HexChar(line[1])&0xF;\r
+\r
                                line += 2;\r
                        }\r
 \r
@@ -1046,23 +1062,23 @@ int CGit::Revert(CTGitPath &path,bool keep)
        if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)\r
        {       //To init git repository, there are not HEAD, so we can use git reset command\r
                cmd.Format(_T("git.exe rm --cache -- \"%s\""),path.GetGitPathString());\r
-               if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
                        return -1;\r
        }\r
        else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )\r
        {\r
                cmd.Format(_T("git.exe mv \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());\r
-               if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
                        return -1;\r
                \r
                cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitOldPathString());\r
-               if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
                        return -1;\r
        }\r
        else\r
        {\r
                cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitPathString());\r
-               if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
                        return -1;\r
        }\r
        return 0;\r