From ad9304cbf76713dd56c8b9d89ad0cd159d8c519f Mon Sep 17 00:00:00 2001 From: Frank Li Date: Fri, 21 Aug 2009 22:12:25 +0800 Subject: [PATCH] Fixed issue #147: Add ability to drop / view stash Signed-off-by: Frank Li --- src/Git/GitRev.cpp | 2 ++ src/TortoiseProc/GitLogListAction.cpp | 9 +++++++++ src/TortoiseProc/LogDataVector.cpp | 2 ++ 3 files changed, 13 insertions(+) diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp index c428f9c..2155942 100644 --- a/src/Git/GitRev.cpp +++ b/src/Git/GitRev.cpp @@ -48,6 +48,8 @@ void GitRev::Clear() m_Body.Empty(); m_Subject.Empty(); m_CommitHash.Empty(); + m_Ref.Empty(); + m_RefAction.Empty(); m_Mark=0; } diff --git a/src/TortoiseProc/GitLogListAction.cpp b/src/TortoiseProc/GitLogListAction.cpp index 7bf709b..e66ed9a 100644 --- 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); } + if(this->GetShortName(ref,shortname,_T("refs/stash"))) + { + if(CMessageBox::Show(NULL,_T("Are you sure remove ALL stash?"), + _T("TortoiseGit"),MB_YESNO)==IDYES) + cmd.Format(_T("git.exe stash clear")); + else + return; + } + CString out; if(g_Git.Run(cmd,&out,CP_UTF8)) { diff --git a/src/TortoiseProc/LogDataVector.cpp b/src/TortoiseProc/LogDataVector.cpp index 4f49363..84e89ca 100644 --- a/src/TortoiseProc/LogDataVector.cpp +++ b/src/TortoiseProc/LogDataVector.cpp @@ -205,6 +205,8 @@ int CLogDataVector::ParserFromRefLog(CString ref) if(ref<0) continue; + rev.Clear(); + rev.m_CommitHash=one.Left(ref); int action=one.Find(_T(' '),ref+1); int message; -- 2.11.0