Show stash flag at log dialog

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

diff --git a/src/TortoiseProc/Colors.cpp b/src/TortoiseProc/Colors.cpp
index 312418c..cc98a5f 100644 (file)
--- a/src/TortoiseProc/Colors.cpp
+++ b/src/TortoiseProc/Colors.cpp
@@ -38,6 +38,7 @@ CColors::COLOR_DATA CColors::m_ColorArray[]=
        {LocalBranch,_T("Software\\TortoiseGit\\Colors\\LocalBranch"), RGB(0, 195, 0)},\r
        {RemoteBranch,_T("Software\\TortoiseGit\\Colors\\RemoteBranch"), RGB(255, 221, 170)},\r
        {Tag,_T("Software\\TortoiseGit\\Colors\\Tag"), RGB(255, 255, 0)},\r
+       {Stash,_T("Software\\TortoiseGit\\Colors\\Stash"), RGB(128, 128, 128)},\r
        {BranchLine1,_T("Software\\TortoiseGit\\Colors\\BranchLine1"), RGB(0,0,0)},\r
        {BranchLine2,_T("Software\\TortoiseGit\\Colors\\BranchLine2"), RGB(0xFF,0,0)},\r
        {BranchLine3,_T("Software\\TortoiseGit\\Colors\\BranchLine3"), RGB(0,0xFF,0)},\r

diff --git a/src/TortoiseProc/Colors.h b/src/TortoiseProc/Colors.h
index 035949a..3a2a7fb 100644 (file)
--- a/src/TortoiseProc/Colors.h
+++ b/src/TortoiseProc/Colors.h
@@ -48,6 +48,7 @@ public:
                LocalBranch,\r
                RemoteBranch,\r
                Tag,\r
+               Stash,\r
                BranchLine1,\r
                BranchLine2,\r
                BranchLine3,\r

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index 77d6527..2bcb049 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -411,6 +411,12 @@ void CGitLogListBase::DrawTagBranch(HDC hdc,CRect &rect,INT_PTR index)
                {\r
                        brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::Tag));\r
                }\r
+               else if(GetShortName(str,shortname,_T("refs/stash")))\r
+               {\r
+                       brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::Stash));\r
+                       shortname=_T("stash");\r
+               }\r
+               \r
 \r
                if(!shortname.IsEmpty())\r
                {\r