Fixed issue #147: Add ability to drop / view stash

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

diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp
index c428f9c..2155942 100644 (file)
--- a/src/Git/GitRev.cpp
+++ b/src/Git/GitRev.cpp
@@ -48,6 +48,8 @@ void GitRev::Clear()
        m_Body.Empty();\r
        m_Subject.Empty();\r
        m_CommitHash.Empty();\r
+       m_Ref.Empty();\r
+       m_RefAction.Empty();\r
        m_Mark=0;\r
 \r
 }\r

diff --git a/src/TortoiseProc/GitLogListAction.cpp b/src/TortoiseProc/GitLogListAction.cpp
index 7bf709b..e66ed9a 100644 (file)
--- a/src/TortoiseProc/GitLogListAction.cpp
+++ b/src/TortoiseProc/GitLogListAction.cpp
@@ -508,6 +508,15 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
                                                cmd.Format(_T("git.exe tag -d %s"),shortname);\r
                                        }\r
 \r
+                                       if(this->GetShortName(ref,shortname,_T("refs/stash")))\r
+                                       {\r
+                                               if(CMessageBox::Show(NULL,_T("<ct=0x0000FF>Are you sure remove <b>ALL</b> stash?</ct>"),\r
+                                                                                          _T("TortoiseGit"),MB_YESNO)==IDYES)\r
+                                                       cmd.Format(_T("git.exe stash clear"));\r
+                                               else\r
+                                                       return;\r
+                                       }\r
+\r
                                        CString out;\r
                                        if(g_Git.Run(cmd,&out,CP_UTF8))\r
                                        {\r

diff --git a/src/TortoiseProc/LogDataVector.cpp b/src/TortoiseProc/LogDataVector.cpp
index 4f49363..84e89ca 100644 (file)
--- a/src/TortoiseProc/LogDataVector.cpp
+++ b/src/TortoiseProc/LogDataVector.cpp
@@ -205,6 +205,8 @@ int CLogDataVector::ParserFromRefLog(CString ref)
                if(ref<0)\r
                        continue;\r
 \r
+               rev.Clear();\r
+\r
                rev.m_CommitHash=one.Left(ref);\r
                int action=one.Find(_T(' '),ref+1);\r
                int message;\r