Fix Commit Show Duplicate Item Problem

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 13b74dd..0c2933e 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -137,13 +137,22 @@ CString CGit::GetUserEmail(void)
 \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

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 8fee91f..a7ca9fc 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -629,7 +629,7 @@ UINT CCommitDlg::StatusThread()
     // 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

diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index 2c0372c..506a869 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -10,8 +10,8 @@
                        >\r
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
-                               WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:commit /path:&quot;D:\\test&quot;"\r
+                               WorkingDirectory="D:\"\r
+                               CommandArguments="/command:commit /path:&quot;D:\\Profiles\\b20596\\buildtest\\TortoiseGit&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r