Fix error in call to GetTimeZoneInformation().

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

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 3a49ed0..09f631b 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -272,9 +272,13 @@ int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash,  CTGitPath *path ,int count
        \r
        if(mask& CGit::LOG_INFO_NO_MERGE )\r
                param += _T(" --no-merges ");\r
+\r
+       if(mask& CGit::LOG_INFO_FOLLOW)\r
+               param += _T(" --follow ");\r
+\r
        param+=hash;\r
 \r
-       cmd.Format(_T("git.exe log %s -z --topo-order --parents %s --pretty=format:\""),\r
+       cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),\r
                                num,param);\r
 \r
        BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));\r
@@ -383,7 +387,7 @@ int CGit::RunLogFile(CString cmd,CString &filename)
        CloseHandle(pi.hProcess);\r
        CloseHandle(houtfile);\r
        return GIT_SUCCESS;\r
-       return 0;\r
+//     return 0;\r
 }\r
 \r
 git_revnum_t CGit::GetHash(CString &friendname)\r