Update document

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

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 7d3787c..3000113 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -603,7 +603,7 @@ int CGit::RunLogFile(CString cmd,CString &filename)
 //     return 0;\r
 }\r
 \r
-git_revnum_t CGit::GetHash(CString &friendname)\r
+git_revnum_t CGit::GetHash(const CString &friendname)\r
 {\r
        CString cmd;\r
        CString out;\r
@@ -657,10 +657,16 @@ int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
                while( pos>=0 )\r
                {\r
                        one=output.Tokenize(_T("\n"),pos);\r
-                       list.push_back(one.Right(one.GetLength()-2));\r
+                       one.Trim(L" \r\n\t");\r
+                       if(one.Find(L" -> ") >= 0 || one.IsEmpty())\r
+                               continue; // skip something like: refs/origin/HEAD -> refs/origin/master\r
                        if(one[0] == _T('*'))\r
+                       {\r
                                if(current)\r
                                        *current=i;\r
+                               one = one.Mid(2);\r
+                       }\r
+                       list.push_back(one);\r
                        i++;\r
                }\r
        }\r
@@ -757,17 +763,19 @@ BOOL CGit::CheckMsysGitDir()
        }\r
 \r
        TCHAR *oldpath,*home;\r
-       size_t size;\r
+       size_t homesize,size;\r
 \r
        // set HOME if not set already\r
-       _tgetenv_s(&size, NULL, 0, _T("HOME"));\r
-       if (!size)\r
+       _tgetenv_s(&homesize, NULL, 0, _T("HOME"));\r
+       if (!homesize)\r
        {\r
                _tdupenv_s(&home,&size,_T("USERPROFILE")); \r
                _tputenv_s(_T("HOME"),home);\r
                free(home);\r
        }\r
+       CString str;\r
 \r
+#ifndef _TORTOISESHELL\r
        //setup ssh client\r
        CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));\r
 \r
@@ -806,7 +814,7 @@ BOOL CGit::CheckMsysGitDir()
        // add git/bin path to PATH\r
 \r
        CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);\r
-       CString str=msysdir;\r
+       str=msysdir;\r
        if(str.IsEmpty())\r
        {\r
                CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
@@ -822,6 +830,7 @@ BOOL CGit::CheckMsysGitDir()
                        return false;\r
                }\r
        }\r
+#endif\r
        //CGit::m_MsysGitPath=str;\r
 \r
        //set path\r
@@ -847,6 +856,10 @@ BOOL CGit::CheckMsysGitDir()
                l_processEnv = GetEnvironmentStrings();\r
                // updated environment is now duplicated for use in CreateProcess, restore original PATH for current process\r
                _tputenv_s(_T("PATH"),sOldPath);\r
+               if(!homesize)\r
+               {\r
+                       _tputenv_s(_T("HOME"),_T(""));\r
+               }\r
 #endif\r
 \r
                bInitialized = TRUE;\r