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

Test and fix for #1869

Author: bording

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"]);
+            }
+        }
     }
 }

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))