From 81340ff080822d303909c03581c30dd3e1592328 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 29 Dec 2021 23:23:27 +0100 Subject: [PATCH] Better indicate that full-history is enabled Signed-off-by: Sven Strickroth --- src/TortoiseProc/LogDlg.cpp | 6 ++---- src/TortoiseProc/LogDlg.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index d6ec48e01..49a637da8 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -98,8 +98,6 @@ CLogDlg::CLogDlg(CWnd* pParent /*=nullptr*/) m_bShowRemoteBranches = !!m_regbShowRemoteBranches; m_regbShowOtherRefs = CRegDWORD(L"Software\\TortoiseGit\\LogDialog\\ShowOtherRefs\\" + str, TRUE); m_bShowOtherRefs = !!m_regbShowOtherRefs; - m_regbFullHistory = CRegDWORD(L"Software\\TortoiseGit\\LogDialog\\FullHistory", FALSE); - m_bFullHistory = !!m_regbFullHistory; m_regAddBeforeCommit = CRegDWORD(L"Software\\TortoiseGit\\AddBeforeCommit", TRUE); m_bShowUnversioned = !!m_regAddBeforeCommit; @@ -3368,7 +3366,7 @@ void CLogDlg::OnBnClickedWalkBehaviour() OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges break; case WALKBEHAVIOUR_FULLHISTORY: - m_regbFullHistory = m_bFullHistory = !m_bFullHistory; + m_bFullHistory = !m_bFullHistory; if (m_bFullHistory) m_LogList.m_ShowMask |= CGit::LOG_INFO_FULL_HISTORY; else @@ -3390,7 +3388,7 @@ void CLogDlg::OnBnClickedWalkBehaviour() default: break; } - m_ctrlWalkBehavior.SetCheck((m_bFirstParent || m_bNoMerges || m_bFollowRenames || m_iCompressedGraph) ? BST_CHECKED : BST_UNCHECKED); + m_ctrlWalkBehavior.SetCheck((m_bFirstParent || m_bNoMerges || m_bFollowRenames || m_iCompressedGraph || m_bFullHistory) ? BST_CHECKED : BST_UNCHECKED); } } diff --git a/src/TortoiseProc/LogDlg.h b/src/TortoiseProc/LogDlg.h index 54079fd86..e7eb3bad2 100644 --- a/src/TortoiseProc/LogDlg.h +++ b/src/TortoiseProc/LogDlg.h @@ -168,7 +168,6 @@ protected: private: CRegDWORD m_regbAllBranch; CRegDWORD m_regbShowTags; - CRegDWORD m_regbFullHistory; CRegDWORD m_regbShowLocalBranches; CRegDWORD m_regbShowRemoteBranches; CRegDWORD m_regbShowOtherRefs; -- 2.11.4.GIT