From ba2b0b85f700483d38f31b2a8bcb94ef27ebbde6 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 17 Dec 2016 13:21:33 +0100 Subject: [PATCH] Do not rely on user settings when executing unit tests Signed-off-by: Sven Strickroth --- src/Git/Git.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp index 6609de247..d15a297d8 100644 --- a/src/Git/Git.cpp +++ b/src/Git/Git.cpp @@ -151,6 +151,11 @@ static git_transport_certificate_check_cb g_Git2CheckCertificateCallback; static void GetSortOptions() { +#ifdef GTEST_INCLUDE_GTEST_GTEST_H_ + g_bSortLogical = true; + g_bSortLocalBranchesFirst = true; + g_bSortTagsReversed = false; +#else g_bSortLogical = !CRegDWORD(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_CURRENT_USER); if (g_bSortLogical) g_bSortLogical = !CRegDWORD(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_LOCAL_MACHINE); @@ -160,6 +165,7 @@ static void GetSortOptions() g_bSortTagsReversed = !!CRegDWORD(L"Software\\TortoiseGit\\SortTagsReversed", 0, false, HKEY_LOCAL_MACHINE); if (!g_bSortTagsReversed) g_bSortTagsReversed = !!CRegDWORD(L"Software\\TortoiseGit\\SortTagsReversed", 0, false, HKEY_CURRENT_USER); +#endif } static int LogicalComparePredicate(const CString &left, const CString &right) -- 2.11.4.GIT