From aef6643d11dcf33e11ca08c4574c7787520a4339 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 25 Feb 2013 00:58:22 +0100 Subject: [PATCH] Fixed issue #1646: TortoiseGit Log gives undeterministic results (log does not apply --boundary any more by default) Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/GitLogListBase.cpp | 5 ++++- src/TortoiseProc/GitLogListBase.h | 1 + src/TortoiseProc/Settings/SettingsAdvanced.cpp | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 4d90b7224..4b5a9749e 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -25,6 +25,7 @@ Released: unreleased * Fixed issue #1657: Dirty submodule commit does not open the underling submodule commit dialog * Fixed issue #1552: TGitCache prevents a git clone from performing successfully * Fixed issue #1631: Set focus to branch menu in Switch/Checkout window + * Fixed issue #1646: TortoiseGit Log gives undeterministic results (log does not apply --boundary any more by default) = Release 1.8.1.0 = Released: 2013-02-07 diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index 713b18519..8747ad544 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -151,6 +151,7 @@ CGitLogListBase::CGitLogListBase():CHintListCtrl() m_ColumnRegKey=_T("log"); m_bSymbolizeRefNames = !!CRegDWORD(_T("Software\\TortoiseGit\\SymbolizeRefNames"), FALSE); + m_bIncludeBoundaryCommits = !!CRegDWORD(_T("Software\\TortoiseGit\\LogIncludeBoundaryCommits"), FALSE); m_AsyncThreadExit = FALSE; m_AsyncDiffEvent = ::CreateEvent(NULL,FALSE,TRUE,NULL); @@ -2329,7 +2330,9 @@ int CGitLogListBase::BeginFetchLog() path=&this->m_Path; int mask; - mask = CGit::LOG_INFO_ONLY_HASH | CGit::LOG_INFO_BOUNDARY; + mask = CGit::LOG_INFO_ONLY_HASH; + if (m_bIncludeBoundaryCommits) + mask |= CGit::LOG_INFO_BOUNDARY; // if(this->m_bAllBranch) mask |= m_ShowMask ; diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h index b55da2ca4..434e86ecb 100644 --- a/src/TortoiseProc/GitLogListBase.h +++ b/src/TortoiseProc/GitLogListBase.h @@ -528,6 +528,7 @@ protected: GIT_LOG m_DllGitLog; CString m_SingleRemote; bool m_bSymbolizeRefNames; + bool m_bIncludeBoundaryCommits; ColumnManager m_ColumnManager; DWORD m_dwDefaultColumns; diff --git a/src/TortoiseProc/Settings/SettingsAdvanced.cpp b/src/TortoiseProc/Settings/SettingsAdvanced.cpp index 86f3f6cb1..811eb200a 100644 --- a/src/TortoiseProc/Settings/SettingsAdvanced.cpp +++ b/src/TortoiseProc/Settings/SettingsAdvanced.cpp @@ -62,6 +62,10 @@ CSettingsAdvanced::CSettingsAdvanced() settings[i].type = CSettingsAdvanced::SettingTypeBoolean; settings[i++].def.b = true; + settings[i].sName = L"LogIncludeBoundaryCommits"; + settings[i].type = CSettingsAdvanced::SettingTypeBoolean; + settings[i++].def.b = false; + settings[i].sName = L"NoSortLocalBranchesFirst"; settings[i].type = CSettingsAdvanced::SettingTypeBoolean; settings[i++].def.b = false; -- 2.11.4.GIT