test/UnitTests/GitIndexTest.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2015-2018 - TortoiseGit
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19
  20 #include "stdafx.h"
  21 #include "RepositoryFixtures.h"
  22 #include "gitindex.h"
  23 #include "gitdll.h"
  24 #include "PathUtils.h"
  25
  26 extern CGitAdminDirMap g_AdminDirMap; // not optimal yet
  27
  28 class GitIndexCBasicGitFixture : public CBasicGitFixture
  29 {
  30 protected:
  31         virtual void SetUp()
  32         {
  33                 CBasicGitFixture::SetUp();
  34                 g_AdminDirMap.clear();
  35         }
  36 };
  37
  38 class GitIndexCBasicGitWithEmptyRepositoryFixture : public CBasicGitWithEmptyRepositoryFixture
  39 {
  40 protected:
  41         virtual void SetUp()
  42         {
  43                 CBasicGitWithEmptyRepositoryFixture::SetUp();
  44                 g_AdminDirMap.clear();
  45         }
  46 };
  47
  48 class GitIndexCBasicGitWithTestRepoFixture : public CBasicGitWithTestRepoFixture
  49 {
  50 protected:
  51         virtual void SetUp()
  52         {
  53                 CBasicGitWithTestRepoFixture::SetUp();
  54                 g_AdminDirMap.clear();
  55         }
  56 };
  57
  58 class CBasicGitWithMultiLinkedTestWithSubmoduleRepoFixture : public CBasicGitWithTestRepoCreatorFixture
  59 {
  60 protected:
  61         virtual void SetUp()
  62         {
  63                 CBasicGitWithTestRepoCreatorFixture::SetUp();
  64
  65                 // ====Main Work Tree Setup====
  66                 SetUpTestRepo(m_MainWorkTreePath);
  67
  68                 m_Git.m_CurrentDir = m_MainWorkTreePath;
  69                 EXPECT_NE(0, SetCurrentDirectory(m_MainWorkTreePath));
  70
  71                 CString output;
  72                 EXPECT_EQ(0, m_Git.Run(L"git.exe checkout -f master", &output, nullptr, CP_UTF8));
  73                 EXPECT_STRNE(L"", output);
  74
  75                 if (CGit::ms_bCygwinGit)
  76                         return;
  77
  78                 // ====Source of the Sub-Module====
  79                 // Setup the repository in which the submodule will be fetched from
  80                 SetUpTestRepo(m_SubmoduleSource);
  81
  82                 //====Sub-Module Inside of The Main Work Tree (Root Level)====
  83                 output.Empty();
  84                 EXPECT_EQ(0, m_Git.Run(L"git.exe submodule add \"" + m_SubmoduleSource + "\" sub1", &output, nullptr, CP_UTF8));
  85                 EXPECT_STREQ(L"", output);
  86
  87                 output.Empty();
  88                 EXPECT_EQ(0, m_Git.Run(L"git.exe commit -a -m\"Add submodule for testing\"", &output, nullptr, CP_UTF8));
  89                 EXPECT_STRNE(L"", output);
  90
  91                 // ====Linked Work Tree setup (Absolute Path)====
  92                 // Linked worktree using git worktree with an absolute path
  93                 output.Empty();
  94                 EXPECT_EQ(0, m_Git.Run(L"git.exe worktree add -b TestBranch \"" + m_LinkedWorkTreePath + "\"", &output, nullptr, CP_UTF8));
  95                 EXPECT_STRNE(L"", output);
  96         }
  97
  98         CString m_MainWorkTreePath = m_Dir.GetTempDir() + L"\\MainWorkTree";
  99         CString m_LinkedWorkTreePath = m_Dir.GetTempDir() + L"\\LinkedWorkTree";
 100         CString m_SubmoduleSource = m_Dir.GetTempDir() + L"\\SubmoduleSource";
 101 };
 102
 103 INSTANTIATE_TEST_CASE_P(GitIndex, GitIndexCBasicGitFixture, testing::Values(LIBGIT2));
 104 INSTANTIATE_TEST_CASE_P(GitIndex, GitIndexCBasicGitWithEmptyRepositoryFixture, testing::Values(LIBGIT2));
 105 INSTANTIATE_TEST_CASE_P(GitIndex, GitIndexCBasicGitWithTestRepoFixture, testing::Values(LIBGIT2));
 106 INSTANTIATE_TEST_CASE_P(GitIndex, CBasicGitWithMultiLinkedTestWithSubmoduleRepoFixture, testing::Values(LIBGIT2));
 107
 108 TEST_P(GitIndexCBasicGitFixture, EmptyDir)
 109 {
 110         CGitIndexList indexList;
 111         EXPECT_EQ(-1, indexList.ReadIndex(m_Dir.GetTempDir()));
 112         EXPECT_EQ(0U, indexList.size());
 113         EXPECT_FALSE(indexList.m_bHasConflicts);
 114 }
 115
 116
 117 static void ReadAndCheckIndex(CGitIndexList& indexList, const CString& gitdir, unsigned int offset = 0)
 118 {
 119         EXPECT_EQ(0, indexList.ReadIndex(gitdir));
 120         ASSERT_EQ(14 + offset, indexList.size());
 121
 122         EXPECT_STREQ(L"ansi.txt", indexList[offset].m_FileName);
 123         EXPECT_EQ(102, indexList[offset].m_Size);
 124         EXPECT_EQ(8, indexList[offset].m_Flags);
 125         EXPECT_EQ(0, indexList[offset].m_FlagsExtended);
 126         EXPECT_STREQ(L"961bdffbfce1bc617fb594091c3229f1cc674d76", indexList[offset].m_IndexHash.ToString());
 127         EXPECT_STREQ(L"copy/ansi.txt", indexList[1 + offset].m_FileName);
 128         EXPECT_EQ(103, indexList[1 + offset].m_Size);
 129         EXPECT_EQ(13, indexList[1 + offset].m_Flags);
 130         EXPECT_EQ(0, indexList[1 + offset].m_FlagsExtended);
 131         EXPECT_STREQ(L"4c44667203f943dc5dbdf3cb526cb7ec24f60c09", indexList[1 + offset].m_IndexHash.ToString());
 132         EXPECT_STREQ(L"copy/utf16-le-nobom.txt", indexList[5 + offset].m_FileName);
 133         EXPECT_EQ(218, indexList[5 + offset].m_Size);
 134         EXPECT_EQ(23, indexList[5 + offset].m_Flags);
 135         EXPECT_EQ(0, indexList[5 + offset].m_FlagsExtended);
 136         EXPECT_STREQ(L"fbea9ccd85c33fcdb542d8c73f910ea0e70c3ddc", indexList[5 + offset].m_IndexHash.ToString());
 137         EXPECT_STREQ(L"utf8-nobom.txt", indexList[13 + offset].m_FileName);
 138         EXPECT_EQ(139, indexList[13 + offset].m_Size);
 139         EXPECT_EQ(14, indexList[13 + offset].m_Flags);
 140         EXPECT_EQ(0, indexList[13 + offset].m_FlagsExtended);
 141         EXPECT_STREQ(L"c225b3f14869ec8b6da32d52bd15dba0b043031d", indexList[13 + offset].m_IndexHash.ToString());
 142         EXPECT_FALSE(indexList.m_bHasConflicts);
 143 }
 144
 145 TEST_P(GitIndexCBasicGitWithTestRepoFixture, ReadIndex)
 146 {
 147         CGitIndexList indexList;
 148         ReadAndCheckIndex(indexList, m_Dir.GetTempDir());
 149
 150         CString testFile = m_Dir.GetTempDir() + L"\\1.txt";
 151         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(testFile, L"this is testing file."));
 152         CString output;
 153         EXPECT_EQ(0, m_Git.Run(L"git.exe add 1.txt", &output, CP_UTF8));
 154         EXPECT_STREQ(L"", output);
 155
 156         ReadAndCheckIndex(indexList, m_Dir.GetTempDir(), 1);
 157
 158         EXPECT_STREQ(L"1.txt", indexList[0].m_FileName);
 159         EXPECT_EQ(21, indexList[0].m_Size);
 160         EXPECT_EQ(5, indexList[0].m_Flags);
 161         EXPECT_EQ(0, indexList[0].m_FlagsExtended);
 162         EXPECT_STREQ(L"e4aac1275dfc440ec521a76e9458476fe07038bb", indexList[0].m_IndexHash.ToString());
 163
 164         EXPECT_EQ(0, m_Git.Run(L"git.exe rm -f 1.txt", &output, CP_UTF8));
 165
 166         ReadAndCheckIndex(indexList, m_Dir.GetTempDir());
 167
 168         output.Empty();
 169         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(testFile, L"this is testing file."));
 170         EXPECT_EQ(0, m_Git.Run(L"git.exe add -N 1.txt", &output, CP_UTF8));
 171         EXPECT_STREQ(L"", output);
 172
 173         ReadAndCheckIndex(indexList, m_Dir.GetTempDir(), 1);
 174
 175         EXPECT_STREQ(L"1.txt", indexList[0].m_FileName);
 176         EXPECT_EQ(0, indexList[0].m_Size);
 177         EXPECT_EQ(16389, indexList[0].m_Flags);
 178         EXPECT_EQ(GIT_IDXENTRY_INTENT_TO_ADD, indexList[0].m_FlagsExtended);
 179         EXPECT_STREQ(L"e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", indexList[0].m_IndexHash.ToString());
 180 }
 181
 182 TEST_P(GitIndexCBasicGitWithTestRepoFixture, GetFileStatus)
 183 {
 184         CGitIndexList indexList;
 185         ReadAndCheckIndex(indexList, m_Dir.GetTempDir());
 186
 187         git_wc_status2_t status = { git_wc_status_none, false, false };
 188         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"does-not-exist.txt", status, 10, 20, false));
 189         EXPECT_EQ(git_wc_status_unversioned, status.status);
 190
 191         __int64 time = -1;
 192         __int64 filesize = -1;
 193         status = { git_wc_status_none, false, false };
 194         EXPECT_EQ(-1, CGit::GetFileModifyTime(CombinePath(m_Dir.GetTempDir(), L"ansi.txt"), &time, nullptr, &filesize));
 195         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"ansi.txt", status, time, filesize, false));
 196         EXPECT_EQ(git_wc_status_deleted, status.status);
 197         filesize = 42; // some arbitrary size, i.e., file exists but is changed
 198         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"ansi.txt", status, time, filesize, false));
 199         EXPECT_EQ(git_wc_status_modified, status.status);
 200
 201         CString output;
 202         EXPECT_EQ(0, m_Git.Run(L"git.exe reset --hard", &output, CP_UTF8));
 203
 204         EXPECT_EQ(0, CGit::GetFileModifyTime(CombinePath(m_Dir.GetTempDir(), L"ansi.txt"), &time, nullptr, &filesize));
 205         status = { git_wc_status_none, false, false };
 206         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"ansi.txt", status, time, filesize, false));
 207         EXPECT_EQ(git_wc_status_normal, status.status);
 208         EXPECT_FALSE(status.assumeValid);
 209         EXPECT_FALSE(status.skipWorktree);
 210
 211         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(CombinePath(m_Dir.GetTempDir(), L"ansi.txt"), L"this is testing file."));
 212         EXPECT_EQ(0, CGit::GetFileModifyTime(CombinePath(m_Dir.GetTempDir(), L"ansi.txt"), &time, nullptr, &filesize));
 213         status = { git_wc_status_none, false, false };
 214         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"ansi.txt", status, time, filesize, false));
 215         EXPECT_EQ(git_wc_status_modified, status.status);
 216         EXPECT_FALSE(status.assumeValid);
 217         EXPECT_FALSE(status.skipWorktree);
 218
 219         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(CombinePath(m_Dir.GetTempDir(), L"just-added.txt"), L"this is testing file."));
 220         EXPECT_EQ(0, m_Git.Run(L"git.exe add -- just-added.txt", &output, CP_UTF8));
 221
 222         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(CombinePath(m_Dir.GetTempDir(), L"noted-as-added.txt"), L"this is testing file."));
 223         EXPECT_EQ(0, m_Git.Run(L"git.exe add -N -- noted-as-added.txt", &output, CP_UTF8));
 224
 225         EXPECT_EQ(0, m_Git.Run(L"git.exe update-index --skip-worktree -- ansi.txt", &output, CP_UTF8));
 226         EXPECT_EQ(0, indexList.ReadIndex(m_Dir.GetTempDir()));
 227         EXPECT_FALSE(indexList.m_bHasConflicts);
 228         status = { git_wc_status_none, false, false };
 229         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"ansi.txt", status, time, filesize, false));
 230         EXPECT_EQ(git_wc_status_normal, status.status);
 231         EXPECT_FALSE(status.assumeValid);
 232         EXPECT_TRUE(status.skipWorktree);
 233
 234         EXPECT_EQ(0, CGit::GetFileModifyTime(CombinePath(m_Dir.GetTempDir(), L"just-added.txt"), &time, nullptr, &filesize));
 235         status = { git_wc_status_none, false, false };
 236         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"just-added.txt", status, time, filesize, false));
 237         EXPECT_EQ(git_wc_status_normal, status.status);
 238
 239         EXPECT_EQ(0, CGit::GetFileModifyTime(CombinePath(m_Dir.GetTempDir(), L"noted-as-added.txt"), &time, nullptr, &filesize));
 240         status = { git_wc_status_none, false, false };
 241         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"noted-as-added.txt", status, time, filesize, false));
 242         EXPECT_EQ(git_wc_status_added, status.status);
 243         EXPECT_FALSE(status.assumeValid);
 244         EXPECT_FALSE(status.skipWorktree);
 245
 246         EXPECT_EQ(0, m_Git.Run(L"git.exe update-index --no-skip-worktree ansi.txt", &output, CP_UTF8));
 247
 248         Sleep(1000);
 249         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(CombinePath(m_Dir.GetTempDir(), L"just-added.txt"), L"this IS testing file."));
 250         EXPECT_EQ(0, CGit::GetFileModifyTime(CombinePath(m_Dir.GetTempDir(), L"just-added.txt"), &time, nullptr, &filesize));
 251         status = { git_wc_status_none, false, false };
 252         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"just-added.txt", status, time, filesize, false));
 253         EXPECT_EQ(git_wc_status_modified, status.status);
 254
 255         output.Empty();
 256         EXPECT_EQ(0, m_Git.Run(L"git.exe checkout --force forconflict", &output, CP_UTF8));
 257         EXPECT_STRNE(L"", output);
 258
 259         output.Empty();
 260         EXPECT_EQ(1, m_Git.Run(L"git.exe merge simple-conflict", &output, CP_UTF8));
 261         EXPECT_STRNE(L"", output);
 262
 263         EXPECT_EQ(0, indexList.ReadIndex(m_Dir.GetTempDir()));
 264         EXPECT_EQ(9U, indexList.size());
 265         EXPECT_TRUE(indexList.m_bHasConflicts);
 266
 267         EXPECT_EQ(0, CGit::GetFileModifyTime(CombinePath(m_Dir.GetTempDir(), L"ansi.txt"), &time, nullptr, &filesize));
 268         status = { git_wc_status_none, false, false };
 269         EXPECT_EQ(0, indexList.GetFileStatus(m_Dir.GetTempDir(), L"ansi.txt", status, time, filesize, false));
 270         EXPECT_EQ(git_wc_status_conflicted, status.status);
 271 }
 272
 273 TEST(GitIndex, SearchInSortVector)
 274 {
 275         std::vector<CGitFileName> vector;
 276         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", 9, false));
 277         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", 0, false));
 278         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", -1, false));
 279
 280         vector.push_back(CGitFileName(L"One", 0, 0));
 281         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", 9, false));
 282         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", -1, false));
 283         EXPECT_EQ(0U, SearchInSortVector(vector, L"something", 0, false)); // do we really need this behavior?
 284         EXPECT_EQ(0U, SearchInSortVector(vector, L"One", 3, false));
 285         EXPECT_EQ(0U, SearchInSortVector(vector, L"One", -1, false));
 286         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"One/", 4, false));
 287         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"one", 3, false));
 288         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"one", -1, false));
 289         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"one/", 4, false));
 290
 291         vector.push_back(CGitFileName(L"tWo", 0, 0));
 292         DoSortFilenametSortVector(vector, false);
 293         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", 9, false));
 294         EXPECT_EQ(0U, SearchInSortVector(vector, L"One", 3, false));
 295         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"one", 3, false));
 296         EXPECT_EQ(1U, SearchInSortVector(vector, L"tWo", 3, false));
 297         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"two", 3, false));
 298         EXPECT_EQ(1U, SearchInSortVector(vector, L"t", 1, false));
 299         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"0", 1, false));
 300         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"z", 1, false));
 301
 302         vector.push_back(CGitFileName(L"b/1", 0, 0));
 303         vector.push_back(CGitFileName(L"b/2", 0, 0));
 304         vector.push_back(CGitFileName(L"a", 0, 0));
 305         vector.push_back(CGitFileName(L"b/3", 0, 0));
 306         vector.push_back(CGitFileName(L"b/4", 0, 0));
 307         vector.push_back(CGitFileName(L"b/5", 0, 0));
 308         DoSortFilenametSortVector(vector, false);
 309         EXPECT_EQ(0U, SearchInSortVector(vector, L"One", 3, false));
 310         EXPECT_EQ(3U, SearchInSortVector(vector, L"b/2", 3, false));
 311         EXPECT_EQ(3U, SearchInSortVector(vector, L"b/2", -1, false));
 312         EXPECT_LT(2U, SearchInSortVector(vector, L"b/", 2, false));
 313         EXPECT_GE(6U, SearchInSortVector(vector, L"b/", 2, false));
 314         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"b/6", 3, false));
 315         EXPECT_EQ(1U, SearchInSortVector(vector, L"a", 1, false));
 316         EXPECT_EQ(7U, SearchInSortVector(vector, L"tWo", 3, false));
 317 }
 318
 319 TEST(GitIndex, SearchInSortVector_IgnoreCase)
 320 {
 321         std::vector<CGitFileName> vector;
 322         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", 9, true));
 323         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", 0, true));
 324         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", -1, true));
 325
 326         vector.push_back(CGitFileName(L"One", 0, 0));
 327         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", 9, true));
 328         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", -1, true));
 329         EXPECT_EQ(0U, SearchInSortVector(vector, L"something", 0, true)); // do we really need this behavior?
 330         EXPECT_EQ(0U, SearchInSortVector(vector, L"One", 3, true));
 331         EXPECT_EQ(0U, SearchInSortVector(vector, L"One", -1, true));
 332         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"One/", 4, true));
 333         EXPECT_EQ(0U, SearchInSortVector(vector, L"one", 3, true));
 334         EXPECT_EQ(0U, SearchInSortVector(vector, L"one", -1, true));
 335         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"one/", 4, true));
 336
 337         vector.push_back(CGitFileName(L"tWo", 0, 0));
 338         DoSortFilenametSortVector(vector, true);
 339         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"something", 9, true));
 340         EXPECT_EQ(0U, SearchInSortVector(vector, L"One", 3, true));
 341         EXPECT_EQ(0U, SearchInSortVector(vector, L"one", 3, true));
 342         EXPECT_EQ(1U, SearchInSortVector(vector, L"tWo", 3, true));
 343         EXPECT_EQ(1U, SearchInSortVector(vector, L"two", 3, true));
 344         EXPECT_EQ(1U, SearchInSortVector(vector, L"t", 1, true));
 345         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"0", 1, true));
 346         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"z", 1, true));
 347
 348         vector.push_back(CGitFileName(L"b/1", 0, 0));
 349         vector.push_back(CGitFileName(L"b/2", 0, 0));
 350         vector.push_back(CGitFileName(L"a", 0, 0));
 351         vector.push_back(CGitFileName(L"b/3", 0, 0));
 352         vector.push_back(CGitFileName(L"b/4", 0, 0));
 353         vector.push_back(CGitFileName(L"b/5", 0, 0));
 354         DoSortFilenametSortVector(vector, true);
 355         EXPECT_EQ(0U, SearchInSortVector(vector, L"a", 1, true));
 356         EXPECT_EQ(2U, SearchInSortVector(vector, L"b/2", 3, true));
 357         EXPECT_EQ(2U, SearchInSortVector(vector, L"b/2", -1, true));
 358         EXPECT_LT(1U, SearchInSortVector(vector, L"b/", 2, true));
 359         EXPECT_GE(5U, SearchInSortVector(vector, L"b/", 2, true));
 360         EXPECT_EQ(NPOS, SearchInSortVector(vector, L"b/6", 3, true));
 361         EXPECT_EQ(6U, SearchInSortVector(vector, L"One", 3, true));
 362         EXPECT_EQ(7U, SearchInSortVector(vector, L"tWo", 3, true));
 363 }
 364
 365 static void CheckRangeInSortVector(bool ignoreCase)
 366 {
 367         std::vector<CGitFileName> vector;
 368
 369         size_t start = NPOS;
 370         size_t end = NPOS;
 371         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"something", 9, ignoreCase, &start, &end, NPOS));
 372         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"something", 9, ignoreCase, &start, &end, 0));
 373         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"something", 9, ignoreCase, &start, nullptr, 0));
 374         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"something", 9, ignoreCase, nullptr, &end, 0));
 375         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"something", 9, ignoreCase, nullptr, &end, 1));
 376         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"", 0, ignoreCase, &start, &end, 0));
 377         EXPECT_EQ(NPOS, start);
 378         EXPECT_EQ(NPOS, end);
 379
 380         vector.push_back(CGitFileName(L"a", 0, 0));
 381         start = end = NPOS;
 382         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"something", 9, ignoreCase, &start, &end, NPOS));
 383         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"something", 9, ignoreCase, &start, nullptr, 0));
 384         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"something", 9, ignoreCase, nullptr, &end, 0));
 385         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"something", 9, ignoreCase, nullptr, &end, 1));
 386
 387         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"a", 1, ignoreCase, &start, &end, NPOS));
 388         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"a", 1, ignoreCase, &start, nullptr, 0));
 389         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"a", 1, ignoreCase, nullptr, &end, 0));
 390         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"a", 1, ignoreCase, nullptr, &end, 1));
 391         start = end = NPOS;
 392         EXPECT_EQ(0, GetRangeInSortVector(vector, L"", 0, ignoreCase, &start, &end, 0));
 393         EXPECT_EQ(0U, start);
 394         EXPECT_EQ(0U, end);
 395         start = end = NPOS;
 396         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"", 0, ignoreCase, &start, &end, 1));
 397
 398         start = end = NPOS;
 399         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"0", 1, ignoreCase, &start, &end, 0));
 400         EXPECT_EQ(NPOS, start);
 401         EXPECT_EQ(NPOS, end);
 402         start = end = NPOS;
 403         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"b", 1, ignoreCase, &start, &end, 0));
 404         EXPECT_EQ(NPOS, start);
 405         EXPECT_EQ(NPOS, end);
 406
 407         start = end = NPOS;
 408         EXPECT_EQ(0, GetRangeInSortVector(vector, L"a", 1, ignoreCase, &start, &end, 0));
 409         EXPECT_EQ(0U, start);
 410         EXPECT_EQ(0U, end);
 411
 412         vector.push_back(CGitFileName(L"b/1", 0, 0));
 413         vector.push_back(CGitFileName(L"b/2", 0, 0));
 414         vector.push_back(CGitFileName(L"b/3", 0, 0));
 415         vector.push_back(CGitFileName(L"b/4", 0, 0));
 416         vector.push_back(CGitFileName(L"b/5", 0, 0));
 417
 418         start = end = NPOS;
 419         EXPECT_EQ(0, GetRangeInSortVector(vector, L"a", 1, ignoreCase, &start, &end, 0));
 420         EXPECT_EQ(0U, start);
 421         EXPECT_EQ(0U, end);
 422
 423         start = end = NPOS;
 424         EXPECT_EQ(0, GetRangeInSortVector(vector, L"b/", 2, ignoreCase, &start, &end, 1));
 425         EXPECT_EQ(1U, start);
 426         EXPECT_EQ(5U, end);
 427
 428         start = end = NPOS;
 429         EXPECT_EQ(0, GetRangeInSortVector(vector, L"b/", 2, ignoreCase, &start, &end, 2));
 430         EXPECT_EQ(1U, start);
 431         EXPECT_EQ(5U, end);
 432
 433         start = end = NPOS;
 434         EXPECT_EQ(0, GetRangeInSortVector(vector, L"b/", 2, ignoreCase, &start, &end, 4));
 435         EXPECT_EQ(1U, start);
 436         EXPECT_EQ(5U, end);
 437
 438         start = end = NPOS;
 439         EXPECT_EQ(0, GetRangeInSortVector(vector, L"b/", 2, ignoreCase, &start, &end, 5));
 440         EXPECT_EQ(1U, start);
 441         EXPECT_EQ(5U, end);
 442
 443         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"b/", 2, ignoreCase, &start, &end, 6)); // 6 is >= vector.size()
 444
 445         start = end = NPOS;
 446         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"c/", 2, ignoreCase, &start, &end, 0));
 447         EXPECT_EQ(NPOS, start);
 448         EXPECT_EQ(NPOS, end);
 449
 450         start = end = NPOS;
 451         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"c/", 2, ignoreCase, &start, &end, 5));
 452         EXPECT_EQ(NPOS, start);
 453         EXPECT_EQ(NPOS, end);
 454
 455         vector.push_back(CGitFileName(L"c", 0, 0));
 456         vector.push_back(CGitFileName(L"d", 0, 0));
 457
 458         start = end = NPOS;
 459         EXPECT_EQ(0, GetRangeInSortVector(vector, L"b/", 2, ignoreCase, &start, &end, 1));
 460         EXPECT_EQ(1U, start);
 461         EXPECT_EQ(5U, end);
 462
 463         start = end = NPOS;
 464         EXPECT_EQ(0, GetRangeInSortVector(vector, L"b/", 2, ignoreCase, &start, &end, 2));
 465         EXPECT_EQ(1U, start);
 466         EXPECT_EQ(5U, end);
 467
 468         start = end = NPOS;
 469         EXPECT_EQ(0, GetRangeInSortVector(vector, L"b/", 2, ignoreCase, &start, &end, 4));
 470         EXPECT_EQ(1U, start);
 471         EXPECT_EQ(5U, end);
 472
 473         start = end = NPOS;
 474         EXPECT_EQ(0, GetRangeInSortVector(vector, L"b/", 2, ignoreCase, &start, &end, 5));
 475         EXPECT_EQ(1U, start);
 476         EXPECT_EQ(5U, end);
 477
 478         start = end = NPOS;
 479         EXPECT_EQ(-1, GetRangeInSortVector(vector, L"c/", 2, ignoreCase, &start, &end, 6));
 480         EXPECT_EQ(NPOS, start);
 481         EXPECT_EQ(NPOS, end);
 482
 483         start = end = NPOS;
 484         EXPECT_EQ(0, GetRangeInSortVector(vector, L"c", 1, ignoreCase, &start, &end, 6));
 485         EXPECT_EQ(6U, start);
 486         EXPECT_EQ(6U, end);
 487
 488         start = end = NPOS;
 489         EXPECT_EQ(0, GetRangeInSortVector(vector, L"", 0, ignoreCase, &start, &end, 0));
 490         EXPECT_EQ(0U, start);
 491         EXPECT_EQ(7U, end);
 492 }
 493
 494 TEST(GitIndex, GetRangeInSortVector)
 495 {
 496         CheckRangeInSortVector(false);
 497         CheckRangeInSortVector(true);
 498 }
 499
 500 TEST(GitIndex, CGitIgnoreItem)
 501 {
 502         CAutoTempDir tempDir;
 503         CGitIgnoreItem ignoreItem;
 504
 505         int ignoreCase = 0;
 506         int type = DT_DIR;
 507         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 508         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 509         type = DT_REG;
 510         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 511         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 512
 513         EXPECT_EQ(-1, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), L"does-not-exist", false, &ignoreCase));
 514         EXPECT_EQ(-1, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), L"does-not-exist", true, &ignoreCase));
 515
 516         CString ignoreFile = tempDir.GetTempDir() + L"\\.gitignore";
 517
 518         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L""));
 519         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 520         EXPECT_STREQ("", ignoreItem.m_BaseDir);
 521         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 522         EXPECT_STREQ("", ignoreItem.m_BaseDir);
 523
 524         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"#"));
 525         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 526         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 527
 528         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"# comment"));
 529         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 530         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 531
 532         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"\n"));
 533         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 534         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 535
 536         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"\n#"));
 537         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 538         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 539
 540         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"*.tmp\n"));
 541         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 542         type = DT_DIR;
 543         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 544         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tmp", type));
 545         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tmp", type));
 546         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tmp.1", type));
 547         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("text.tMp", type));
 548         ignoreCase = 1;
 549         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 550         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tmp", type));
 551         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tmp", type));
 552         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tmp.1", type));
 553         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tMp", type));
 554         type = DT_REG;
 555         ignoreCase = 0;
 556         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 557         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tmp", type));
 558         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tmp", type));
 559         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tmp.1", type));
 560         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("text.tMp", type));
 561         ignoreCase = 1;
 562         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 563         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tmp", type));
 564         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tmp", type));
 565         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tmp.1", type));
 566         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tMp", type));
 567         ignoreCase = 0;
 568         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 569         type = DT_DIR;
 570         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 571         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tmp", type));
 572         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tmp", type));
 573         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tmp.1", type));
 574         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("text.tMp", type));
 575         type = DT_REG;
 576         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 577         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tmp", type));
 578         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tmp", type));
 579         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tmp.1", type));
 580         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("text.tMp", type));
 581
 582         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"*.tMp\n"));
 583         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 584         type = DT_DIR;
 585         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 586         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tMp", type));
 587         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tMp", type));
 588         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tMp.1", type));
 589         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("text.tmp", type));
 590         ignoreCase = 1;
 591         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 592         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tMp", type));
 593         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tMp", type));
 594         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tmp.1", type));
 595         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tmp", type));
 596         type = DT_REG;
 597         ignoreCase = 0;
 598         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 599         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tMp", type));
 600         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tMp", type));
 601         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tMp.1", type));
 602         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("text.tmp", type));
 603         ignoreCase = 1;
 604         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 605         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tMp", type));
 606         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tMp", type));
 607         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tMp.1", type));
 608         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tmp", type));
 609         ignoreCase = 0;
 610         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 611         type = DT_DIR;
 612         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 613         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tMp", type));
 614         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tMp", type));
 615         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tMp.1", type));
 616         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("text.tmp", type));
 617         type = DT_REG;
 618         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 619         EXPECT_EQ(1, ignoreItem.IsPathIgnored("text.tMp", type));
 620         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/text.tMp", type));
 621         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("1.tMp.1", type));
 622         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("text.tmp", type));
 623
 624         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"some-file\n"));
 625         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 626         type = DT_DIR;
 627         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 628         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 629         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 630         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 631         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-file", type));
 632         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 633         ignoreCase = 1;
 634         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 635         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 636         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 637         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 638         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-file", type));
 639         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 640         type = DT_REG;
 641         ignoreCase = 0;
 642         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 643         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 644         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 645         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 646         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-file", type));
 647         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 648         ignoreCase = 1;
 649         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 650         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 651         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 652         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 653         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-file", type));
 654         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 655         ignoreCase = 0;
 656         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 657         type = DT_DIR;
 658         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 659         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 660         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 661         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 662         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-file", type));
 663         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 664         ignoreCase = 1;
 665         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 666         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 667         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 668         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 669         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-file", type));
 670         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 671         ignoreCase = 0;
 672         type = DT_REG;
 673         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 674         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 675         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 676         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 677         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-file", type));
 678         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 679         ignoreCase = 1;
 680         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 681         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 682         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 683         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 684         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-file", type));
 685         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 686
 687         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"some-File\n"));
 688         ignoreCase = 0;
 689         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 690         type = DT_DIR;
 691         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 692         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 693         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-File", type));
 694         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 695         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-File", type));
 696         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 697         ignoreCase = 1;
 698         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 699         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 700         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 701         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 702         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-File", type));
 703         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 704         type = DT_REG;
 705         ignoreCase = 0;
 706         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 707         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 708         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-File", type));
 709         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 710         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-File", type));
 711         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 712         ignoreCase = 1;
 713         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("not-ignored", type));
 714         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/not-ignored", type));
 715         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-File", type));
 716         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-File", type));
 717         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subDir/some-File", type));
 718         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 719
 720         ignoreCase = 1;
 721         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"\n\nsome-file\n"));
 722         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 723         type = DT_DIR;
 724         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 725         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 726         type = DT_REG;
 727         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 728         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 729         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 730         type = DT_DIR;
 731         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 732         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 733         type = DT_REG;
 734         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 735         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 736
 737         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"/some-file"));
 738         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 739         type = DT_DIR;
 740         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 741         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 742         type = DT_REG;
 743         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 744         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 745         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 746         type = DT_DIR;
 747         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 748         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 749         type = DT_REG;
 750         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 751         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-file", type));
 752
 753         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"some-dir/"));
 754         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 755         type = DT_DIR;
 756         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir", type));
 757         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir/some-file", type));
 758         type = DT_REG;
 759         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-file", type));
 760         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir", type));
 761         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir/some-file", type));
 762         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 763         type = DT_DIR;
 764         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir", type));
 765         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir/some-file", type));
 766         type = DT_REG;
 767         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-file", type));
 768         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir", type));
 769         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir/some-file", type));
 770
 771         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"some-*\n!some-file"));
 772         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 773         type = DT_DIR;
 774         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir", type));
 775         EXPECT_EQ(0, ignoreItem.IsPathIgnored("some-file", type));
 776         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something", type));
 777         type = DT_REG;
 778         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir", type));
 779         EXPECT_EQ(0, ignoreItem.IsPathIgnored("some-file", type));
 780         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something", type));
 781         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 782         type = DT_DIR;
 783         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir", type));
 784         EXPECT_EQ(0, ignoreItem.IsPathIgnored("some-file", type));
 785         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something", type));
 786         type = DT_REG;
 787         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir", type));
 788         EXPECT_EQ(0, ignoreItem.IsPathIgnored("some-file", type));
 789         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something", type));
 790
 791         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"some-file\nanother/dir/*"));
 792         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 793         type = DT_DIR;
 794         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir", type));
 795         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 796         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("another", type));
 797         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("another/dir", type));
 798         EXPECT_EQ(1, ignoreItem.IsPathIgnored("another/dir/some", type));
 799         type = DT_REG;
 800         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir", type));
 801         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 802         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("another", type));
 803         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("another/dir", type));
 804         EXPECT_EQ(1, ignoreItem.IsPathIgnored("another/dir/some", type));
 805         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 806         type = DT_DIR;
 807         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir", type));
 808         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 809         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("another", type));
 810         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("another/dir", type));
 811         EXPECT_EQ(1, ignoreItem.IsPathIgnored("another/dir/some", type));
 812         type = DT_REG;
 813         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir", type));
 814         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-file", type));
 815         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("another", type));
 816         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("another/dir", type));
 817         EXPECT_EQ(1, ignoreItem.IsPathIgnored("another/dir/some", type));
 818
 819         EXPECT_TRUE(::CreateDirectory(tempDir.GetTempDir() + L"\\subdir", nullptr));
 820         ignoreFile = tempDir.GetTempDir() + L"\\subdir\\.gitignore";
 821         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"/something"));
 822         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 823         EXPECT_STREQ("subdir/", ignoreItem.m_BaseDir);
 824         type = DT_DIR;
 825         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something", type));
 826         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something/more", type));
 827         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir/something", type));
 828         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/something", type));
 829         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something/more", type));
 830         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-dir/something", type));
 831         type = DT_REG;
 832         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something", type));
 833         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something/more", type));
 834         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir/something", type));
 835         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/something", type));
 836         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something/more", type));
 837         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-dir/something", type));
 838         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 839         EXPECT_STREQ("", ignoreItem.m_BaseDir);
 840         type = DT_DIR;
 841         EXPECT_EQ(1, ignoreItem.IsPathIgnored("something", type));
 842         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something/more", type));
 843         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir/something", type));
 844         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something", type));
 845         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something/more", type));
 846         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-dir/something", type));
 847         type = DT_REG;
 848         EXPECT_EQ(1, ignoreItem.IsPathIgnored("something", type));
 849         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something/more", type));
 850         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("some-dir/something", type));
 851         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something", type));
 852         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something/more", type));
 853         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/some-dir/something", type));
 854
 855         EXPECT_TRUE(CStringUtils::WriteStringToTextFile(ignoreFile, L"something"));
 856         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, false, &ignoreCase));
 857         EXPECT_STREQ("subdir/", ignoreItem.m_BaseDir);
 858         type = DT_DIR;
 859         EXPECT_EQ(1, ignoreItem.IsPathIgnored("something", type));
 860         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something/more", type));
 861         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir/something", type));
 862         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/something", type));
 863         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something/more", type));
 864         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-dir/something", type));
 865         type = DT_REG;
 866         EXPECT_EQ(1, ignoreItem.IsPathIgnored("something", type));
 867         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something/more", type));
 868         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir/something", type));
 869         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/something", type));
 870         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something/more", type));
 871         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-dir/something", type));
 872         EXPECT_EQ(0, ignoreItem.FetchIgnoreList(tempDir.GetTempDir(), ignoreFile, true, &ignoreCase));
 873         EXPECT_STREQ("", ignoreItem.m_BaseDir);
 874         type = DT_DIR;
 875         EXPECT_EQ(1, ignoreItem.IsPathIgnored("something", type));
 876         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something/more", type));
 877         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir/something", type));
 878         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/something", type));
 879         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something/more", type));
 880         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-dir/something", type));
 881         type = DT_REG;
 882         EXPECT_EQ(1, ignoreItem.IsPathIgnored("something", type));
 883         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("something/more", type));
 884         EXPECT_EQ(1, ignoreItem.IsPathIgnored("some-dir/something", type));
 885         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/something", type));
 886         EXPECT_EQ(-1, ignoreItem.IsPathIgnored("subdir/something/more", type));
 887         EXPECT_EQ(1, ignoreItem.IsPathIgnored("subdir/some-dir/something", type));
 888 }
 889
 890 TEST_P(CBasicGitWithMultiLinkedTestWithSubmoduleRepoFixture, AdminDirMap) // Submodule & Test
 891 {
 892         CString adminDir;
 893         CString workDir;
 894
 895         // Test if the main work tree admin directory can be found
 896         adminDir = g_AdminDirMap.GetAdminDir(m_MainWorkTreePath);
 897         EXPECT_TRUE(CPathUtils::IsSamePath(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git", adminDir));
 898
 899         // Test test main work tree reverse lookup
 900         workDir = g_AdminDirMap.GetWorkingCopy(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git");
 901         EXPECT_TRUE(CPathUtils::IsSamePath(m_MainWorkTreePath, workDir));
 902
 903         if (CGit::ms_bCygwinGit)
 904                 return;
 905
 906         // Test if the linked repository admin directory can be found (**WITHOUT** trailing path delimiter)
 907         adminDir = g_AdminDirMap.GetAdminDir(m_LinkedWorkTreePath);
 908         EXPECT_TRUE(CPathUtils::IsSamePath(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git", adminDir));
 909
 910         // Test if the linked worktree admin directory can be found (**WITH** trailing path delimiter)
 911         adminDir = g_AdminDirMap.GetWorktreeAdminDir(CPathUtils::BuildPathWithPathDelimiter(m_LinkedWorkTreePath));
 912         EXPECT_TRUE(CPathUtils::IsSamePath(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git\\worktrees\\LinkedWorkTree", adminDir));
 913
 914         // Test if the linked worktree admin directory can be found (**WITHOUT** trailing path delimiter)
 915         adminDir = g_AdminDirMap.GetWorktreeAdminDir(m_LinkedWorkTreePath);
 916         EXPECT_TRUE(CPathUtils::IsSamePath(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git\\worktrees\\LinkedWorkTree", adminDir));
 917
 918         // Test reverse lookup on linked worktree admin directory (**WITH** trailing path delimiter)
 919         workDir = g_AdminDirMap.GetWorkingCopy(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git\\worktrees\\LinkedWorkTree\\");
 920         EXPECT_TRUE(CPathUtils::IsSamePath(m_LinkedWorkTreePath, workDir));
 921
 922         // Test reverse lookup on linked worktree admin directory (**WITHOUT** trailing path delimiter)
 923         workDir = g_AdminDirMap.GetWorkingCopy(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git\\worktrees\\LinkedWorkTree");
 924         EXPECT_TRUE(CPathUtils::IsSamePath(m_LinkedWorkTreePath, workDir));
 925
 926         // Test if the sub-module admin directory can be found (**WITH** trailing path delimiter)
 927         adminDir = g_AdminDirMap.GetAdminDir(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L"sub1\\");
 928         EXPECT_TRUE(CPathUtils::IsSamePath(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git\\modules\\sub1", adminDir));
 929
 930         // Test if the sub-module admin directory can be found (**WITHOUT** trailing path delimiter)
 931         adminDir = g_AdminDirMap.GetAdminDir(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L"sub1");
 932         EXPECT_TRUE(CPathUtils::IsSamePath(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git\\modules\\sub1", adminDir));
 933
 934         // Test if reverse lookup on submodule works (**WITH** trailing path delimiter)
 935         workDir = g_AdminDirMap.GetWorkingCopy(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git\\modules\\sub1\\");
 936         EXPECT_TRUE(CPathUtils::IsSamePath(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L"sub1", workDir));
 937
 938         // Test if reverse lookup on submodule works (**WITHOUT** trailing path delimiter)
 939         workDir = g_AdminDirMap.GetWorkingCopy(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L".git\\modules\\sub1");
 940         EXPECT_TRUE(CPathUtils::IsSamePath(CPathUtils::BuildPathWithPathDelimiter(m_MainWorkTreePath) + L"sub1", workDir));
 941 }