// relative path\r
CString rename;\r
rename.Format(_T("(from %s)"),GitPath->GetGitOldPathString());\r
- if(GitPath->m_Action & CTGitPath::LOGACTIONS_REPLACED)\r
+ if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))\r
entryname+=rename;\r
\r
InsertItem(index, entryname, icon_idx);\r
{\r
int status=((CTGitPath*)m_arStatusArray[i])->m_Action;\r
\r
- if(status&CTGitPath::LOGACTIONS_ADDED)\r
+ if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))\r
m_nAdded++;\r
\r
if(status&CTGitPath::LOGACTIONS_DELETED)\r
\r
CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);\r
CTGitPath file2;\r
- if(file1.m_Action & CTGitPath::LOGACTIONS_REPLACED)\r
+ if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))\r
{\r
file2.SetFromGit(file1.GetGitOldPathString());\r
}else\r
{\r
crText = m_Colors.GetColor(CColors::Conflict);\r
\r
- }else if(entry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)\r
+ }else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))\r
{\r
crText = m_Colors.GetColor(CColors::Modified);\r
\r
- }else if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)\r
+ }else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))\r
{\r
crText = m_Colors.GetColor(CColors::Added);\r
}\r