8000 Test and fix for https://github.com/libgit2/libgit2sharp/issues/1869 by tyrielv · Pull Request #1870 · libgit2/libgit2sharp · GitHub
[go: up one dir, main page]
Skip to content

Test and fix for https://github.com/libgit2/libgit2sharp/issues/1869 #1870

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

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Test and fix for https://github.com/libgit2/libgit2sharp/issues/1869 #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Test and fix for #1869
  • Loading branch information
@tyrielv @bording
tyrielv authored and bording committed Nov 26, 2024
commit 2dd7eca45c2f95f24817ba8fc6270989df14f78e
18 changes: 18 additions & 0 deletions LibGit2Sharp.Tests/TreeDefinitionFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,5 +587,23 @@ public void CanAddAnExistingBlobEntryWithAnExistingTree()
Assert.NotNull(td["1/branch_file.txt"]);
}
}

[Fact]
public void CanRemoveADirectoryWithChildren()
{
const string blobSha = "a8233120f6ad708f843d861ce2b7228ec4e3dec6";
string path = Sa AF05 ndboxBareTestRepo();
using (var repo = new Repository(path))
{
TreeDefinition td = new TreeDefinition();
var blob = repo.Lookup<Blob>(blobSha);
td.Add("folder/subfolder/file1", blob, Mode.NonExecutableFile);
td.Add("folder/file1", blob, Mode.NonExecutableFile);
td.Remove("folder");
Assert.Null(td["folder"]);
Tree t = repo.ObjectDatabase.CreateTree(td);
Assert.Null(t["folder"]);
}
}
}
}
1 change: 1 addition & 0 deletions LibGit2Sharp/TreeDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public virtual TreeDefinition Remove(string treeEntryPath)
if (segments.Item2 == null)
{
entries.Remove(segments.Item1);
unwrappedTrees.Remove(segments.Item1);
}

if (!unwrappedTrees.ContainsKey(segments.Item1))
Expand Down
0