From 7ff203c8bc8dd69ab0bb0fb7d15c31bce7821841 Mon Sep 17 00:00:00 2001 From: Kevin Willford Date: Tue, 9 Oct 2018 10:45:06 -0600 Subject: [PATCH 1/2] Add test that adds untracked file in new folder 2 levels deep --- .../Tests/EnlistmentPerFixture/GitFilesTests.cs | 1 + .../Tests/GitCommands/GitCommandsTests.cs | 5 +++++ GVFS/GVFS.FunctionalTests/Tools/GVFSHelpers.cs | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/GitFilesTests.cs b/GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/GitFilesTests.cs index 3313fb8f68..b90943d12b 100644 --- a/GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/GitFilesTests.cs +++ b/GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/GitFilesTests.cs @@ -155,6 +155,7 @@ public void CaseOnlyRenameOfNewFolderKeepsModifiedPathsEntries() this.Enlistment.WaitForBackgroundOperations().ShouldEqual(true, "Background operations failed to complete."); GVFSHelpers.ModifiedPathsShouldContain(this.fileSystem, this.Enlistment.DotGVFSRoot, "Folder/"); + GVFSHelpers.ModifiedPathsShouldNotContain(this.fileSystem, this.Enlistment.DotGVFSRoot, "Folder/testfile"); this.fileSystem.RenameDirectory(this.Enlistment.RepoRoot, "Folder", "folder"); this.Enlistment.WaitForBackgroundOperations().ShouldEqual(true, "Background operations failed to complete."); diff --git a/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs index 31ac5cb08c..28ac308026 100644 --- a/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs +++ b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs @@ -16,6 +16,8 @@ public class GitCommandsTests : GitRepoTests private const string EncodingFilename = "ريلٌأكتوبرûمارسأغسطسºٰٰۂْٗ۵ريلٌأك.txt"; private const string ContentWhenEditingFile = "// Adding a comment to the file"; private const string UnknownTestName = "Unknown"; + private const string TopLevelFolderToCreate = "level1"; + private const string SubFolderToCreate = "level2"; private static readonly string EditFilePath = Path.Combine("GVFS", "GVFS.Common", "GVFSContext.cs"); private static readonly string DeleteFilePath = Path.Combine("GVFS", "GVFS", "Program.cs"); @@ -1088,6 +1090,9 @@ private void CommitChangesSwitchBranchSwitchBack(Action fileSystemAction, [Calle private void CreateFile() { this.CreateFile("Some content here", Path.GetRandomFileName() + "tempFile.txt"); + this.CreateFolder(TopLevelFolderToCreate); + this.CreateFolder(Path.Combine(TopLevelFolderToCreate, SubFolderToCreate)); + this.CreateFile("File in new folder", Path.Combine(TopLevelFolderToCreate, SubFolderToCreate, Path.GetRandomFileName() + "folderFile.txt")); } private void EditFile() diff --git a/GVFS/GVFS.FunctionalTests/Tools/GVFSHelpers.cs b/GVFS/GVFS.FunctionalTests/Tools/GVFSHelpers.cs index 0de0d127ca..5dbc77982e 100644 --- a/GVFS/GVFS.FunctionalTests/Tools/GVFSHelpers.cs +++ b/GVFS/GVFS.FunctionalTests/Tools/GVFSHelpers.cs @@ -117,7 +117,7 @@ public static void ModifiedPathsShouldContain(FileSystemRunner fileSystem, strin string[] modifedPathLines = modifedPathsContents.Split(new[] { ModifiedPathsNewLine }, StringSplitOptions.None); foreach (string gitPath in gitPaths) { - modifedPathLines.ShouldContain(path => path.Equals(ModifedPathsLineAddPrefix + gitPath)); + modifedPathLines.ShouldContain(path => path.Equals(ModifedPathsLineAddPrefix + gitPath, StringComparison.OrdinalIgnoreCase)); } } From 03fba043f131d376af455f058478c29289544554 Mon Sep 17 00:00:00 2001 From: Kevin Willford Date: Tue, 9 Oct 2018 14:07:26 -0600 Subject: [PATCH 2/2] Update git for windows version --- GVFS/GVFS.Build/GVFS.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GVFS/GVFS.Build/GVFS.props b/GVFS/GVFS.Build/GVFS.props index 2c39f75004..ef965a8c45 100644 --- a/GVFS/GVFS.Build/GVFS.props +++ b/GVFS/GVFS.Build/GVFS.props @@ -3,7 +3,7 @@ 0.2.173.2 - 2.20180814.4 + 2.20181011.3