Skip to content

Fix missing untracked files when created in subfolder #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix missing untracked files when created in subfolder #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ff203c
Add test that adds untracked file in new folder 2 levels deep
Oct 9, 2018
03fba04
Update git for windows version
Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GVFS/GVFS.Build/GVFS.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup Label="Parameters">
<GVFSVersion>0.2.173.2</GVFSVersion>
<GitPackageVersion>2.20180814.4</GitPackageVersion>
<GitPackageVersion>2.20181011.3</GitPackageVersion>
</PropertyGroup>

<PropertyGroup Label="DefaultSettings">
Expand Down
1 change: 1 addition & 0 deletions GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/GitFilesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down
5 changes: 5 additions & 0 deletions GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tools/GVFSHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down