diff options
| author | James Antill <james@and.org> | 2014-07-18 00:01:31 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-07-18 10:10:06 -0400 |
| commit | 3645afc6d70fbe8817371152665a3b262f4c3dd9 (patch) | |
| tree | b761766f8e56446cfaeb62c9f904934be6882216 | |
| parent | ff6883ca0655ac8844cd783caf6a7d8815515ba3 (diff) | |
| download | ostree-3645afc6d70fbe8817371152665a3b262f4c3dd9.tar.gz | |
core: Use ostree_commit_get_parent in ostree_repo_resolve_rev
| -rw-r--r-- | 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 64ae96f7..2b05e6f6 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 { |