From 9480d914cab1afc0789f46b566fa120a9a15f0b2 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 30 Mar 2015 16:09:08 +0200 Subject: [PATCH] No need to care for parents as we want to diff the file at a specific revision Signed-off-by: Sven Strickroth --- src/Git/GitStatusListCtrl.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp index e4d72e83f..7865f7553 100644 --- a/src/Git/GitStatusListCtrl.cpp +++ b/src/Git/GitStatusListCtrl.cpp @@ -2073,10 +2073,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point) if (!filepath) return; m_sMarkForDiffFilename = filepath->GetGitPathString(); - if (!(filepath->m_ParentNo & MERGE_MASK)) - m_sMarkForDiffVersion.Format(_T("%s^%d"), m_CurrentVersion, (filepath->m_ParentNo & PARENT_MASK) + 1); - else - m_sMarkForDiffVersion = m_CurrentVersion; + m_sMarkForDiffVersion = m_CurrentVersion; break; case IDGITLC_PREPAREDIFF_COMPARE: @@ -2084,12 +2081,6 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point) if (!filepath) return; - CString currentVersion; - if (!(filepath->m_ParentNo & MERGE_MASK)) - currentVersion.Format(_T("%s^%d"), m_CurrentVersion, (filepath->m_ParentNo & PARENT_MASK) + 1); - else - currentVersion = m_CurrentVersion; - CTGitPath savedFile(m_sMarkForDiffFilename); CGitDiff::Diff(filepath, &savedFile, m_CurrentVersion, m_sMarkForDiffVersion); } -- 2.11.4.GIT