From 46259e5528865b240b0db163723d83e43d88efa4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 18 May 2014 22:35:10 +0200 Subject: [PATCH] Correctly get FillBasedOnIndexFlags if subfolder is selected (fixes issue #2191) Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Git/TGitPath.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 32e87e840..b5dd6ed38 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -20,6 +20,7 @@ Released: Unreleased * Fixed issue #2104: Opening log for non-git folder results in multiple error messages * Fixed issue #2192: Shell context menu not detecting submodule if submodule name differs from submodule path * Fixed issue #2187: Misshowed branch on many dialogs in the new version + * Fixed issue #2191: Skip-worktree or assume-valid flagged files are not always listed if subfolder is selected = Release 1.8.8.0 = Released: 2014-04-01 diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp index a3f9a4790..20af174f9 100644 --- a/src/Git/TGitPath.cpp +++ b/src/Git/TGitPath.cpp @@ -1121,7 +1121,7 @@ int CTGitPathList::FillBasedOnIndexFlags(unsigned short flag, CTGitPathList* lis one.Empty(); g_Git.StringAppend(&one, (BYTE*)e->path, CP_UTF8); - if (!(!list || (*list)[j].GetWinPathString().IsEmpty() || one == (*list)[j].GetWinPathString() || (PathIsDirectory(g_Git.m_CurrentDir + L"\\" + (*list)[j].GetWinPathString()) && one.Find((*list)[j].GetWinPathString() + _T("/")) == 0))) + if (!(!list || (*list)[j].GetWinPathString().IsEmpty() || one == (*list)[j].GetWinPathString() || (PathIsDirectory(g_Git.m_CurrentDir + L"\\" + (*list)[j].GetWinPathString()) && one.Find((*list)[j].GetGitPathString() + _T("/")) == 0))) continue; //SetFromGit will clear all status -- 2.11.4.GIT