OSDN Git Service

Show "fast forward file" at merged commit
[tortoisegit/TortoiseGitJp.git] / src / Git / TGitPath.cpp
index c9dc54c..9bdbed4 100644 (file)
@@ -1039,7 +1039,12 @@ int CTGitPathList::ParserFromLog(BYTE_VECTOR &log)
                        if(GitPath)\r
                        {\r
                                GitPath->ParserAction( log[actionstart] );      \r
-                               GitPath->m_Action |=merged?CTGitPath::LOGACTIONS_MERGED:0;\r
+                               \r
+                               if(merged)\r
+                               {\r
+                                       GitPath->m_Action |= CTGitPath::LOGACTIONS_MERGED;\r
+                                       GitPath->m_Action &= ~CTGitPath::LOGACTIONS_FORWORD;\r
+                               }\r
                                m_Action |=GitPath->m_Action;\r
 \r
                        }else\r
@@ -1110,6 +1115,7 @@ int CTGitPathList::ParserFromLog(BYTE_VECTOR &log)
                                //path.SetFromGit(pathname);\r
                                path.m_StatAdd=StatAdd;\r
                                path.m_StatDel=StatDel;\r
+                               path.m_Action |= CTGitPath::LOGACTIONS_FORWORD;\r
                                AddPath(path);\r
                        }\r
 \r
@@ -1919,6 +1925,10 @@ CString CTGitPath::GetActionName(int action)
                return _T("Rename");\r
        if(action  & CTGitPath::LOGACTIONS_COPY)\r
                return _T("Copy");\r
+\r
+       if(action  & CTGitPath::LOGACTIONS_FORWORD )\r
+               return _T("Forward");\r
+\r
        if(action & CTGitPath::LOGACTIONS_REBASE_EDIT)\r
                return _T("Edit");\r
        if(action & CTGitPath::LOGACTIONS_REBASE_SQUASH)\r