diff --git a/src/mergeresult.c b/src/mergeresult.c index 1493d6a..1ce4497 100644 --- a/src/mergeresult.c +++ b/src/mergeresult.c @@ -86,35 +86,10 @@ MergeResult_fastforward_oid__get__(MergeResult *self) else Py_RETURN_NONE; } -PyDoc_STRVAR(MergeResult_index__doc__, "Merge repository index"); - -PyObject * -MergeResult_index__get__(MergeResult *self) -{ - git_index *index; - Index *py_index; - int err; - - err = git_repository_index(&index, self->repo->repo); - if (err < 0) - return NULL; - - py_index = PyObject_GC_New(Index, &IndexType); - if (!py_index) { - return NULL; - } - - py_index->repo = self->repo; - py_index->index = index; - Py_INCREF(py_index); - return (PyObject*) py_index; -} - PyGetSetDef MergeResult_getseters[] = { GETTER(MergeResult, is_uptodate), GETTER(MergeResult, is_fastforward), GETTER(MergeResult, fastforward_oid), - GETTER(MergeResult, index), {NULL}, }; diff --git a/test/test_repository.py b/test/test_repository.py index 0ba5766..11ebc4d 100644 --- a/test/test_repository.py +++ b/test/test_repository.py @@ -339,8 +339,8 @@ class RepositoryTest_III(utils.RepoTestCaseForMerging): self.assertEquals({'bye.txt': 1}, self.repo.status()) self.assertEquals({'bye.txt': 1}, self.repo.status()) # Checking the index works as expected - merge_result.index.remove('bye.txt') - merge_result.index.write() + self.repo.index.remove('bye.txt') + self.repo.index.write() self.assertEquals({'bye.txt': 128}, self.repo.status()) def test_merge_no_fastforward_conflicts(self): @@ -355,8 +355,8 @@ class RepositoryTest_III(utils.RepoTestCaseForMerging): self.assertEquals({'.gitignore': 132}, self.repo.status()) self.assertEquals({'.gitignore': 132}, self.repo.status()) # Checking the index works as expected - merge_result.index.add('.gitignore') - merge_result.index.write() + self.repo.index.add('.gitignore') + self.repo.index.write() self.assertEquals({'.gitignore': 2}, self.repo.status()) def test_merge_invalid_hex(self):