Add Show Whole Project Checkbox at commitdlg.

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

diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp
index c3a5444..a3ddc54 100644 (file)
--- a/src/Git/TGitPath.cpp
+++ b/src/Git/TGitPath.cpp
@@ -1865,30 +1865,35 @@ CTGitPath * CTGitPathList::LookForGitPath(CString path)
        }\r
        return NULL;\r
 }\r
-\r
-CString CTGitPath::GetActionName()\r
+CString CTGitPath::GetActionName(int action)\r
 {\r
-       if(m_Action  & CTGitPath::LOGACTIONS_ADDED)\r
+       if(action  & CTGitPath::LOGACTIONS_ADDED)\r
                return _T("Added");\r
-       if(m_Action  & CTGitPath::LOGACTIONS_DELETED)\r
+       if(action  & CTGitPath::LOGACTIONS_DELETED)\r
                return _T("Deleted");\r
-       if(m_Action  & CTGitPath::LOGACTIONS_UNMERGED)\r
+       if(action  & CTGitPath::LOGACTIONS_UNMERGED)\r
                return _T("Conflict");\r
-       if(m_Action  & CTGitPath::LOGACTIONS_MODIFIED)\r
+       if(action  & CTGitPath::LOGACTIONS_MODIFIED)\r
                return _T("Modified");\r
-       if(m_Action  & CTGitPath::LOGACTIONS_REPLACED)\r
+       if(action  & CTGitPath::LOGACTIONS_REPLACED)\r
                return _T("Rename");\r
-       if(m_Action  & CTGitPath::LOGACTIONS_COPY)\r
+       if(action  & CTGitPath::LOGACTIONS_COPY)\r
                return _T("Copy");\r
-       if(m_Action & CTGitPath::LOGACTIONS_REBASE_EDIT)\r
+       if(action & CTGitPath::LOGACTIONS_REBASE_EDIT)\r
                return _T("Edit");\r
-       if(m_Action & CTGitPath::LOGACTIONS_REBASE_SQUASH)\r
+       if(action & CTGitPath::LOGACTIONS_REBASE_SQUASH)\r
                return _T("Squash");\r
-       if(m_Action & CTGitPath::LOGACTIONS_REBASE_PICK)\r
+       if(action & CTGitPath::LOGACTIONS_REBASE_PICK)\r
                return _T("Pick");\r
+       if(action & CTGitPath::LOGACTIONS_REBASE_SKIP)\r
+               return _T("Skip");\r
 \r
        return _T("Unknown");\r
 }\r
+CString CTGitPath::GetActionName()\r
+{\r
+       return GetActionName(m_Action);\r
+}\r
 \r
 int CTGitPathList::GetAction()\r
 {\r