Fix use utf8 as git output encode. So commit message can use Chinese

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

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 94a9738..a78504a 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -75,7 +75,7 @@ int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CStri
 void CGit::StringAppend(CString *str,char *p)\r
 {\r
        USES_CONVERSION;\r
-       str->Append(A2W(p));\r
+       str->Append(A2W_CP(p,CP_UTF8));\r
 \r
 }      \r
 BOOL CGit::IsInitRepos()\r

diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp
index bc9aee3..d974c04 100644 (file)
--- a/src/Git/GitRev.cpp
+++ b/src/Git/GitRev.cpp
@@ -76,7 +76,7 @@ int GitRev::ParserFromLog(CString &log)
                        {\r
                        case LOG_REV_ITEM_BEGIN:\r
                                this->Clear();\r
-\r
+                               break;\r
                        case LOG_REV_AUTHOR_NAME:\r
                                this->m_AuthorName = text;\r
                                break;\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index 16601c8..d63f029 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:blame /path:&quot;D:\\Profiles\\b20596\\git\\alloc.c&quot;"\r
+                               CommandArguments="/command:log /path:&quot;D:\\test4\\tt&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r