From 19589ce6df2d32e3d7bfaa43cd43d4109e137ab7 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 27 Nov 2013 19:57:22 +0100 Subject: [PATCH] Don't show branches after rebase actions are done Branches likely do not match any more. Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitLogListBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index aba1a0eb7..565736b09 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -1214,7 +1214,7 @@ void CGitLogListBase::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult) { GitRev* data = (GitRev*)m_arShownList.SafeGetAt(pLVCD->nmcd.dwItemSpec); - if (!m_HashMap[data->m_CommitHash].empty()) + if (!m_HashMap[data->m_CommitHash].empty() && !(SafeGetAction(data) & CTGitPath::LOGACTIONS_REBASE_DONE)) { CRect rect; GetSubItemRect((int)pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect); -- 2.11.4.GIT