[ostree] core: Use ostree_commit_get_parent in ostree_repo_resolve_rev
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] core: Use ostree_commit_get_parent in ostree_repo_resolve_rev
- Date: Fri, 18 Jul 2014 14:10:40 +0000 (UTC)
commit 3645afc6d70fbe8817371152665a3b262f4c3dd9
Author: James Antill <james and org>
Date: Fri Jul 18 00:01:31 2014 -0400
core: Use ostree_commit_get_parent in ostree_repo_resolve_rev
src/libostree/ostree-repo-refs.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/src/libostree/ostree-repo-refs.c b/src/libostree/ostree-repo-refs.c
index 64ae96f..2b05e6f 100644
--- a/src/libostree/ostree-repo-refs.c
+++ b/src/libostree/ostree-repo-refs.c
@@ -381,7 +381,6 @@ ostree_repo_resolve_rev (OstreeRepo *self,
gs_free char *parent_refspec = NULL;
gs_free char *parent_rev = NULL;
gs_unref_variant GVariant *commit = NULL;
- gs_unref_variant GVariant *parent_csum_v = NULL;
parent_refspec = g_strdup (refspec);
parent_refspec[strlen(parent_refspec) - 1] = '\0';
@@ -393,14 +392,12 @@ ostree_repo_resolve_rev (OstreeRepo *self,
&commit, error))
goto out;
- g_variant_get_child (commit, 1, "@ay", &parent_csum_v);
- if (g_variant_n_children (parent_csum_v) == 0)
+ if (!(ret_rev = ostree_commit_get_parent (commit)))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Commit %s has no parent", parent_rev);
goto out;
}
- ret_rev = ostree_checksum_from_bytes_v (parent_csum_v);
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]