From 4b0f759cc051b1df5f7b7f5f6143ee70e2213419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= Date: Mon, 27 Feb 2012 00:13:43 +0100 Subject: [PATCH] Tag.target now returns the oid (not the object) --- pygit2.c | 8 +++----- test/test_tag.py | 10 ++++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pygit2.c b/pygit2.c index 7769ff4..d8d65d8 100644 --- a/pygit2.c +++ b/pygit2.c @@ -1793,12 +1793,10 @@ static PyTypeObject BlobType = { static PyObject * Tag_get_target(Tag *self) { - const git_oid *target_oid; - git_otype target_type; + const git_oid *oid; - target_oid = git_tag_target_oid(self->tag); - target_type = git_tag_type(self->tag); - return lookup_object(self->repo, target_oid, target_type); + oid = git_tag_target_oid(self->tag); + return git_oid_to_python(oid->id); } static PyObject * diff --git a/test/test_tag.py b/test/test_tag.py index 5c11e01..ca11569 100644 --- a/test/test_tag.py +++ b/test/test_tag.py @@ -43,13 +43,15 @@ TAG_SHA = '3d2962987c695a29f1f80b6c3aa4ec046ef44369' class TagTest(utils.BareRepoTestCase): def test_read_tag(self): - tag = self.repo[TAG_SHA] + repo = self.repo + tag = repo[TAG_SHA] + target = repo[tag.target] self.assertTrue(isinstance(tag, pygit2.Tag)) self.assertEqual(pygit2.GIT_OBJ_TAG, tag.type) - self.assertEqual(pygit2.GIT_OBJ_COMMIT, tag.target.type) + self.assertEqual(pygit2.GIT_OBJ_COMMIT, target.type) self.assertEqual('root', tag.name) self.assertEqual('Tagged root commit.\n', tag.message) - self.assertEqual('Initial test data commit.\n', tag.target.message) + self.assertEqual('Initial test data commit.\n', target.message) self.assertEqualSignature( tag.tagger, pygit2.Signature('Dave Borowitz', 'dborowitz@google.com', @@ -72,7 +74,7 @@ class TagTest(utils.BareRepoTestCase): self.assertEqual('3ee44658fd11660e828dfc96b9b5c5f38d5b49bb', tag.hex) self.assertEqual(name, tag.name) - self.assertEqual(target, tag.target.hex) + self.assertEqual(target, utils.oid_to_hex(tag.target)) self.assertEqualSignature(tagger, tag.tagger) self.assertEqual(message, tag.message) self.assertEqual(name, self.repo[tag.hex].name)