Commit 736b910fe5b9621fef211a1db3e1bbff02626f10
2018-06-11T03:21:00
use got_object_open_as_commit() in tog(1)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
diff --git a/tog/tog.c b/tog/tog.c
index f20a7b7..e9d830d 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -308,7 +308,6 @@ fetch_parent_commit(struct commit_queue_entry **pentry,
struct commit_queue_entry *entry, struct got_repository *repo)
{
const struct got_error *err = NULL;
- struct got_object *obj = NULL;
struct got_commit_object *commit;
struct got_object_id *id;
struct got_object_qid *qid;
@@ -319,17 +318,8 @@ fetch_parent_commit(struct commit_queue_entry **pentry,
qid = SIMPLEQ_FIRST(&entry->commit->parent_ids);
if (qid == NULL)
return NULL;
- err = got_object_open(&obj, repo, qid->id);
- if (err)
- return err;
- if (got_object_get_type(obj) != GOT_OBJ_TYPE_COMMIT) {
- err = got_error(GOT_ERR_OBJ_TYPE);
- got_object_close(obj);
- return err;
- }
- err = got_object_commit_open(&commit, repo, obj);
- got_object_close(obj);
+ err = got_object_open_as_commit(&commit, repo, qid->id);
if (err)
return err;
@@ -377,20 +367,17 @@ prepend_commits(int *ncommits, struct commit_queue *commits,
int limit, struct got_repository *repo)
{
const struct got_error *err = NULL;
- struct got_object *first_obj = NULL, *last_obj = NULL;
+ struct got_object *last_obj = NULL;
struct got_commit_object *commit = NULL;
struct got_object_id *id = NULL;
struct commit_queue_entry *entry, *old_head_entry;
*ncommits = 0;
- err = got_object_open(&first_obj, repo, first_id);
+ err = got_object_open_as_commit(&commit, repo, first_id);
if (err)
goto done;
- if (got_object_get_type(first_obj) != GOT_OBJ_TYPE_COMMIT) {
- err = got_error(GOT_ERR_OBJ_TYPE);
- goto done;
- }
+
err = got_object_open(&last_obj, repo, last_id);
if (err)
goto done;
@@ -399,10 +386,6 @@ prepend_commits(int *ncommits, struct commit_queue *commits,
goto done;
}
- err = got_object_commit_open(&commit, repo, first_obj);
- if (err)
- goto done;
-
id = got_object_id_dup(first_id);
if (id == NULL) {
err = got_error_from_errno();
@@ -457,8 +440,6 @@ prepend_commits(int *ncommits, struct commit_queue *commits,
}
done:
- if (first_obj)
- got_object_close(first_obj);
if (last_obj)
got_object_close(last_obj);
return err;