packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Use ostree_commit_get_parent in ostree_repo_resolve_rev

This commit is contained in:
James Antill 2014-07-18 00:01:31 -04:00 committed by Colin Walters
parent ff6883ca06
commit 3645afc6d7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libostree/ostree-repo-refs.c
View File

@ -381,7 +381,6 @@ ostree_repo_resolve_rev (OstreeRepo *self,
gs_free char *parent_refspec = NULL; gs_free char *parent_refspec = NULL;
gs_free char *parent_rev = NULL; gs_free char *parent_rev = NULL;
gs_unref_variant GVariant *commit = NULL; gs_unref_variant GVariant *commit = NULL;
gs_unref_variant GVariant *parent_csum_v = NULL;
parent_refspec = g_strdup (refspec); parent_refspec = g_strdup (refspec);
parent_refspec[strlen(parent_refspec) - 1] = '\0'; parent_refspec[strlen(parent_refspec) - 1] = '\0';
@ -393,14 +392,12 @@ ostree_repo_resolve_rev (OstreeRepo *self,
&commit, error)) &commit, error))
goto out; goto out;
g_variant_get_child (commit, 1, "@ay", &parent_csum_v); if (!(ret_rev = ostree_commit_get_parent (commit)))
if (g_variant_n_children (parent_csum_v) == 0)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Commit %s has no parent", parent_rev); "Commit %s has no parent", parent_rev);
goto out; goto out;
} }
ret_rev = ostree_checksum_from_bytes_v (parent_csum_v);
} }
else else
{ {