From 3a655ae384304587c0b09e6a1d7c7bd23355ba3b Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 30 Dec 2011 03:35:51 +0100 Subject: [PATCH] drop unused code Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitLogListBase.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index fc77bc217..81d6e47d2 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -1570,15 +1570,6 @@ void CGitLogListBase::OnContextMenu(CWnd* pWnd, CPoint point) format.LoadString(IDS_LOG_POPUP_MERGEREV); str.Format(format,g_Git.GetCurrentBranch()); - bool thisbranch = false; - CString currentBranch = _T("refs/heads/")+g_Git.GetCurrentBranch(); - for(int i=0; i < m_HashMap[pSelLogEntry->m_CommitHash].size(); i++) - { - if (m_HashMap[pSelLogEntry->m_CommitHash][i] == currentBranch) - thisbranch = true; - break; - } - if (m_ContextMenuMask&GetContextMenuBit(ID_MERGEREV) && !isHeadCommit && m_hasWC) popup.AppendMenuIcon(ID_MERGEREV, str, IDI_MERGE); @@ -1595,6 +1586,7 @@ void CGitLogListBase::OnContextMenu(CWnd* pWnd, CPoint point) ) { std::vector branchs; + CString currentBranch = _T("refs/heads/")+g_Git.GetCurrentBranch(); CString ref; for(int i=0;im_CommitHash].size();i++) -- 2.11.4.GIT