Merge pull request libgit2#1870 from tyrielv/tree-definition-delete

bording · web-flow · commit 3318b734596d · 2024-11-26T00:19:03.000-05:00
Test and fix for libgit2#1869
diff --git a/LibGit2Sharp.Tests/TreeDefinitionFixture.cs b/LibGit2Sharp.Tests/TreeDefinitionFixture.cs
@@ -587,5 +587,23 @@ public void CanAddAnExistingBlobEntryWithAnExistingTree()
                 Assert.NotNull(td["1/branch_file.txt"]);
             }
         }
+
+        [Fact]
+        public void CanRemoveADirectoryWithChildren()
+        {
+            const string blobSha = "a8233120f6ad708f843d861ce2b7228ec4e3dec6";
+            string path = SandboxBareTestRepo();
+            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"]);
+            }
+        }
     }
 }
diff --git a/LibGit2Sharp/TreeDefinition.cs b/LibGit2Sharp/TreeDefinition.cs
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -587,5 +587,23 @@ public void CanAddAnExistingBlobEntryWithAnExistingTree()`
`587`	`587`	`Assert.NotNull(td["1/branch_file.txt"]);`
`588`	`588`	`}`
`589`	`589`	`}`
	`590`	`+`
	`591`	`+ [Fact]`
	`592`	`+ public void CanRemoveADirectoryWithChildren()`
	`593`	`+ {`
	`594`	`+ const string blobSha = "a8233120f6ad708f843d861ce2b7228ec4e3dec6";`
	`595`	`+ string path = SandboxBareTestRepo();`
	`596`	`+ using (var repo = new Repository(path))`
	`597`	`+ {`
	`598`	`+ TreeDefinition td = new TreeDefinition();`
	`599`	`+ var blob = repo.Lookup<Blob>(blobSha);`
	`600`	`+ td.Add("folder/subfolder/file1", blob, Mode.NonExecutableFile);`
	`601`	`+ td.Add("folder/file1", blob, Mode.NonExecutableFile);`
	`602`	`+ td.Remove("folder");`
	`603`	`+ Assert.Null(td["folder"]);`
	`604`	`+ Tree t = repo.ObjectDatabase.CreateTree(td);`
	`605`	`+ Assert.Null(t["folder"]);`
	`606`	`+ }`
	`607`	`+ }`
`590`	`608`	`}`
`591`	`609`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ public virtual TreeDefinition Remove(string treeEntryPath)`
`94`	`94`	`if (segments.Item2 == null)`
`95`	`95`	`{`
`96`	`96`	`entries.Remove(segments.Item1);`
	`97`	`+ unwrappedTrees.Remove(segments.Item1);`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`if (!unwrappedTrees.ContainsKey(segments.Item1))`