\r
CString CGit::GetCurrentBranch(void)\r
{\r
- CString branch;\r
- Run(_T("git.exe branch"),&branch);\r
- if(branch.GetLength()>0)\r
- {\r
- branch.Replace(_T('*'),_T(' '));\r
- branch.TrimLeft();\r
- return branch;\r
+ CString output;\r
+ //Run(_T("git.exe branch"),&branch);\r
+\r
+ int ret=g_Git.Run(_T("git.exe branch"),&output);\r
+ if(!ret)\r
+ { \r
+ int pos=0;\r
+ CString one;\r
+ while( pos>=0 )\r
+ {\r
+ //i++;\r
+ one=output.Tokenize(_T("\n"),pos);\r
+ //list.push_back(one.Right(one.GetLength()-2));\r
+ if(one[0] == _T('*'))\r
+ return one.Right(one.GetLength()-2);\r
+ }\r
}\r
return CString("");\r
}\r
// Initialise the list control with the status of the files/folders below us\r
BOOL success = m_ListCtrl.GetStatus(m_pathList);\r
\r
- m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));\r
+ //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));\r
if(this->m_bShowUnversioned)\r
m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);\r
\r
>\r
<DebugSettings\r
Command="$(TargetPath)"\r
- WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
- CommandArguments="/command:commit /path:"D:\\test""\r
+ WorkingDirectory="D:\"\r
+ CommandArguments="/command:commit /path:"D:\\Profiles\\b20596\\buildtest\\TortoiseGit""\r
Attach="false"\r
DebuggerType="3"\r
Remote="1"\r