From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 28 Nov 2016 12:58:19 +0000 (+0100)
Subject: pull: scan_commit_object() - don't load variant twice
X-Git-Tag: archive/raspbian/2017.12-1+rpi1~1^2^2^2^2^2^2^2^2^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=59c79d6beb5b147a8c006e3a8f3bed3527a8abcc;p=ostree.git

pull: scan_commit_object() - don't load variant twice

ostree_repo_load_commit already loaded the object, no need
to load it twice.

Closes: #595
Approved by: cgwalters
Origin: upstream, 2016.15, commit:c9b158e

Gbp-Pq: Name pull-scan_commit_object-don-t-load-variant-twice.patch
---

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 9e960792..6f32c77b 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1137,10 +1137,6 @@ scan_commit_object (OtPullData         *pull_data,
   is_partial = pull_data->legacy_transaction_resuming
     || (commitstate & OSTREE_REPO_COMMIT_STATE_PARTIAL) > 0;
 
-  if (!ostree_repo_load_variant (pull_data->repo, OSTREE_OBJECT_TYPE_COMMIT, checksum,
-                                 &commit, error))
-    goto out;
-
   /* PARSE OSTREE_SERIALIZED_COMMIT_VARIANT */
   g_variant_get_child (commit, 1, "@ay", &parent_csum);
   if (g_variant_n_children (parent_csum) > 0)