Fix handling of Commit.tree being set to an actual Tree rather than a Tree id.

NEWS

@@ -15,9 +15,13 @@
     allowing easy finding of current version based on Git tags.
     (Mark Mikofski)
 
- * Add ``Blob.splitlines`` method.
-   (Jelmer Vernooij)
+  * Add ``Blob.splitlines`` method.
+    (Jelmer Vernooij)
 
+ BUG FIXES
+
+  * Fix handling of ``Commit.tree`` being set to an actual
+   tree object rather than a tree id. (Jelmer Vernooij)
 
 0.15.0	2016-10-09
 

dulwich/objects.py

@@ -1181,7 +1181,7 @@ class Commit(ShaFile):
 
     def _serialize(self):
         chunks = []
-        tree_bytes = self._tree.as_raw_string() if isinstance(self._tree, Tree) else self._tree
+        tree_bytes = self._tree.id if isinstance(self._tree, Tree) else self._tree
         chunks.append(git_line(_TREE_HEADER, tree_bytes))
         for p in self._parents:
             chunks.append(git_line(_PARENT_HEADER, p))

dulwich/tests/test_objects.py

@@ -318,6 +318,16 @@ class CommitSerializationTests(TestCase):
         c1.set_raw_string(c.as_raw_string())
         self.assertEqual(30, c1.commit_time)
 
+    def test_full_tree(self):
+        c = self.make_commit(commit_time=30)
+        t = Tree()
+        t.add(b'data-x', 0o644, Blob().id)
+        c.tree = t
+        c1 = Commit()
+        c1.set_raw_string(c.as_raw_string())
+        self.assertEqual(t.id, c1.tree)
+        self.assertEqual(c.as_raw_string(), c1.as_raw_string())
+
     def test_raw_length(self):
         c = self.make_commit()
         self.assertEqual(len(c.as_raw_string()), c.raw_length())