diff options
Diffstat (limited to 'test/git/test_index.py')
| -rw-r--r-- | test/git/test_index.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/git/test_index.py b/test/git/test_index.py index 524f0778..a4e01054 100644 --- a/test/git/test_index.py +++ b/test/git/test_index.py @@ -87,5 +87,12 @@ class TestTree(TestCase): assert isinstance(merge_blobs[0][1], Blob) + # writing a tree should fail with an unmerged index + self.failUnlessRaises(GitCommandError, tree_way_index.write_tree) + + # removed unmerged entries + self.fail("remove unmerged") + + def test_custom_commit(self): self.fail("Custom commit:write tree, make commit with custom parents") |